Skip to content

Commit e1e194b

Browse files
committed
Use deb10 variant of ghc images
1 parent 5e0c624 commit e1e194b

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

9.6/bullseye/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,16 @@ ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
8686
RUN set -eux; \
8787
cd /tmp; \
8888
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
89-
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
89+
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
90+
# But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
91+
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
9092
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
9193
case "$ARCH" in \
92-
# TODO 'aarch64' not available in https://downloads.haskell.org/~ghc/9.6.6/
93-
# 'aarch64') \
94-
# GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
95-
# ;; \
94+
'aarch64') \
95+
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
96+
;; \
9697
'x86_64') \
97-
GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
98+
GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
9899
;; \
99100
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
100101
esac; \

9.6/slim-bullseye/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,16 @@ ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
100100
RUN set -eux; \
101101
cd /tmp; \
102102
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
103-
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
103+
# Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
104+
# But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
105+
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
104106
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
105107
case "$ARCH" in \
106-
# TODO 'aarch64' not available in https://downloads.haskell.org/~ghc/9.6.6/
107-
# 'aarch64') \
108-
# GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
109-
# ;; \
108+
'aarch64') \
109+
GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
110+
;; \
110111
'x86_64') \
111-
GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
112+
GHC_SHA256='15ee68cede5d114a672fb468b9545700edd70a68724ab4e9122c8a23aba8570b'; \
112113
;; \
113114
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
114115
esac; \

0 commit comments

Comments
 (0)