File tree Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Expand file tree Collapse file tree 3 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ ARG CABAL_INSTALL_RELEASE_KEY=A970DF3AC3B9709706D74544B3D9F94B8DCAE210
31
31
RUN set -eux; \
32
32
cd /tmp; \
33
33
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" ; \
34
- CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
34
+ CABAL_INSTALL_TAR="cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
35
+ CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/$CABAL_INSTALL_TAR" ; \
35
36
CABAL_INSTALL_SHA256SUMS_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS" ; \
36
37
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
37
38
case "$ARCH" in \
@@ -51,6 +52,8 @@ RUN set -eux; \
51
52
GNUPGHOME="$(mktemp -d)" ; export GNUPGHOME; \
52
53
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY" ; \
53
54
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
55
+ # confirm we are verying SHA256SUMS that matches the release + sha256
56
+ grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
54
57
gpgconf --kill all; \
55
58
\
56
59
tar -xf cabal-install.tar.gz -C /usr/local/bin; \
Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ ARG CABAL_INSTALL_RELEASE_KEY=A970DF3AC3B9709706D74544B3D9F94B8DCAE210
31
31
RUN set -eux; \
32
32
cd /tmp; \
33
33
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" ; \
34
- CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
34
+ CABAL_INSTALL_TAR="cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
35
+ CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/$CABAL_INSTALL_TAR" ; \
35
36
CABAL_INSTALL_SHA256SUMS_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS" ; \
36
37
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
37
38
case "$ARCH" in \
@@ -51,6 +52,8 @@ RUN set -eux; \
51
52
GNUPGHOME="$(mktemp -d)" ; export GNUPGHOME; \
52
53
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY" ; \
53
54
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
55
+ # confirm we are verying SHA256SUMS that matches the release + sha256
56
+ grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
54
57
gpgconf --kill all; \
55
58
\
56
59
tar -xf cabal-install.tar.gz -C /usr/local/bin; \
Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ ARG CABAL_INSTALL_RELEASE_KEY=A970DF3AC3B9709706D74544B3D9F94B8DCAE210
31
31
RUN set -eux; \
32
32
cd /tmp; \
33
33
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" ; \
34
- CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
34
+ CABAL_INSTALL_TAR="cabal-install-$CABAL_INSTALL-$ARCH-linux-deb10.tar.xz" ; \
35
+ CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/$CABAL_INSTALL_TAR" ; \
35
36
CABAL_INSTALL_SHA256SUMS_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS" ; \
36
37
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
37
38
case "$ARCH" in \
@@ -51,6 +52,8 @@ RUN set -eux; \
51
52
GNUPGHOME="$(mktemp -d)" ; export GNUPGHOME; \
52
53
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY" ; \
53
54
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
55
+ # confirm we are verying SHA256SUMS that matches the release + sha256
56
+ grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
54
57
gpgconf --kill all; \
55
58
\
56
59
tar -xf cabal-install.tar.gz -C /usr/local/bin; \
You can’t perform that action at this time.
0 commit comments