@@ -23,45 +23,39 @@ RUN apt-get update && \
2323 zlib1g-dev && \
2424 rm -rf /var/lib/apt/lists/*
2525
26- ARG STACK=2.9.1
26+ ARG STACK=2.9.3
2727ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
2828
2929RUN set -eux; \
3030 cd /tmp; \
3131 ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)" ; \
32- INSTALL_STACK="true" ; \
3332 STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz" ; \
3433 # sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
3534 case "$ARCH" in \
3635 'aarch64' ) \
37- # Stack does not officially support ARM64, nor do the binaries that exist work.
38- # Hitting https://github.com/commercialhaskell/stack/issues/2103#issuecomment-972329065 when trying to use
39- # stack-2.7.1-linux-aarch64.tar.gz
40- INSTALL_STACK="false" ; \
36+ STACK_SHA256='161e1638da9efc56319f7225b3652ca3f339bcda9eadc7d6ce512f325b0f014a' ; \
4137 ;; \
4238 'x86_64' ) \
43- STACK_SHA256='0581cebe880b8ed47556ee73d8bbb9d602b5b82e38f89f6aa53acaec37e7760d ' ; \
39+ STACK_SHA256='938f689dc45e2693ab1ca3ea215790b3786dfd531dcf6c0bf40842c24e579ae9 ' ; \
4440 ;; \
4541 *) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
4642 esac; \
47- if [ "$INSTALL_STACK" = "true" ]; then \
48- curl -sSL "$STACK_URL" -o stack.tar.gz; \
49- echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
50- \
51- curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
52- GNUPGHOME="$(mktemp -d)" ; export GNUPGHOME; \
53- gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY" ; \
54- gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
55- gpgconf --kill all; \
56- \
57- tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack" ; \
58- stack config set system-ghc --global true; \
59- stack config set install-ghc --global false; \
60- \
61- rm -rf /tmp/*; \
62- \
63- stack --version; \
64- fi
43+ curl -sSL "$STACK_URL" -o stack.tar.gz; \
44+ echo "$STACK_SHA256 stack.tar.gz" | sha256sum --strict --check; \
45+ \
46+ curl -sSL "$STACK_URL.asc" -o stack.tar.gz.asc; \
47+ GNUPGHOME="$(mktemp -d)" ; export GNUPGHOME; \
48+ gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$STACK_RELEASE_KEY" ; \
49+ gpg --batch --verify stack.tar.gz.asc stack.tar.gz; \
50+ gpgconf --kill all; \
51+ \
52+ tar -xf stack.tar.gz -C /usr/local/bin --strip-components=1 "stack-$STACK-linux-$ARCH/stack" ; \
53+ stack config set system-ghc --global true; \
54+ stack config set install-ghc --global false; \
55+ \
56+ rm -rf /tmp/*; \
57+ \
58+ stack --version;
6559
6660ARG CABAL_INSTALL=3.8.1.0
6761ARG CABAL_INSTALL_RELEASE_KEY=E9EC5616017C3EE26B33468CCE1ED8AE0B011D8C
0 commit comments