Skip to content

Commit f9c8232

Browse files
AlistairBpsftw
authored andcommitted
Move the stack args to just before they are needed.
This increases layer cacheability so that new stack versions will not invalide the ghc / cabal install layer.
1 parent af0dc73 commit f9c8232

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

8.10/buster/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ RUN apt-get update && \
99
ARG GHC=8.10.4
1010
ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
1111
ARG CABAL_INSTALL=3.4
12-
ARG STACK=2.7.1
13-
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
14-
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
1512

1613
RUN export GNUPGHOME="$(mktemp -d)" && \
1714
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${DEBIAN_KEY} && \
@@ -34,6 +31,10 @@ RUN export GNUPGHOME="$(mktemp -d)" && \
3431
zlib1g-dev && \
3532
rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
3633

34+
ARG STACK=2.7.1
35+
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
36+
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
37+
3738
RUN export GNUPGHOME="$(mktemp -d)" && \
3839
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \
3940
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \

8.10/stretch/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ RUN apt-get update && \
99
ARG GHC=8.10.4
1010
ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
1111
ARG CABAL_INSTALL=3.4
12-
ARG STACK=2.7.1
13-
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
14-
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
1512

1613
RUN export GNUPGHOME="$(mktemp -d)" && \
1714
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${DEBIAN_KEY} && \
@@ -34,6 +31,10 @@ RUN export GNUPGHOME="$(mktemp -d)" && \
3431
zlib1g-dev && \
3532
rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
3633

34+
ARG STACK=2.7.1
35+
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
36+
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
37+
3738
RUN export GNUPGHOME="$(mktemp -d)" && \
3839
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \
3940
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \

9.0/buster/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ RUN apt-get update && \
99
ARG GHC=9.0.1
1010
ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
1111
ARG CABAL_INSTALL=3.4
12-
ARG STACK=2.7.1
13-
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
14-
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
1512

1613
RUN export GNUPGHOME="$(mktemp -d)" && \
1714
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${DEBIAN_KEY} && \
@@ -34,6 +31,10 @@ RUN export GNUPGHOME="$(mktemp -d)" && \
3431
zlib1g-dev && \
3532
rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
3633

34+
ARG STACK=2.7.1
35+
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
36+
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
37+
3738
RUN export GNUPGHOME="$(mktemp -d)" && \
3839
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \
3940
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \

9.0/stretch/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ RUN apt-get update && \
99
ARG GHC=9.0.1
1010
ARG DEBIAN_KEY=427CB69AAC9D00F2A43CAF1CBA3CBA3FFE22B574
1111
ARG CABAL_INSTALL=3.4
12-
ARG STACK=2.7.1
13-
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
14-
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
1512

1613
RUN export GNUPGHOME="$(mktemp -d)" && \
1714
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${DEBIAN_KEY} && \
@@ -34,6 +31,10 @@ RUN export GNUPGHOME="$(mktemp -d)" && \
3431
zlib1g-dev && \
3532
rm -rf "$GNUPGHOME" /var/lib/apt/lists/*
3633

34+
ARG STACK=2.7.1
35+
ARG STACK_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
36+
ARG STACK_RELEASE_KEY=2C6A674E85EE3FB896AFC9B965101FF31C5C154D
37+
3738
RUN export GNUPGHOME="$(mktemp -d)" && \
3839
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_KEY} && \
3940
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${STACK_RELEASE_KEY} && \

0 commit comments

Comments
 (0)