haskell: add 9.6.6 images #17347
Closed
haskell: add 9.6.6 images #17347
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aarch64 images use deb10 bindists, hope that's not a problem
Diff for bb8510f:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2bc597a..b92cb3a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,16 @@
Maintainers: Albert Krewinkel <albert+docker@tarleb.com> (@tarleb), Andrei Dziahel <develop7@develop7.info> (@develop7)
GitRepo: https://github.com/haskell/docker-haskell
+Tags: 9.6.6-bullseye, 9.6-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 45be610ef8bc3e4f844ff2fff1a66e6809d26dbf
+Directory: 9.6/bullseye
+
+Tags: 9.6.6-slim-bullseye, 9.6-slim-bullseye
+Architectures: amd64, arm64v8
+GitCommit: 45be610ef8bc3e4f844ff2fff1a66e6809d26dbf
+Directory: 9.6/slim-bullseye
+
Tags: 9.10.1-bullseye, 9.10-bullseye, 9-bullseye, bullseye, 9, latest
Architectures: amd64, arm64v8
GitCommit: 65b8848bc9e63d54f12ecf3f31d04621d62d761c
diff --git a/_bashbrew-list b/_bashbrew-list
index 343a90c..c33adf2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,6 +2,10 @@ haskell:9
haskell:9-bullseye
haskell:9-slim
haskell:9-slim-bullseye
+haskell:9.6-bullseye
+haskell:9.6-slim-bullseye
+haskell:9.6.6-bullseye
+haskell:9.6.6-slim-bullseye
haskell:9.10-bullseye
haskell:9.10-slim-bullseye
haskell:9.10.1-bullseye
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 17d6c69..4f18d59 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,4 @@
+haskell:9.6-bullseye
+haskell:9.6-slim-bullseye
haskell:latest
haskell:slim
diff --git a/haskell_latest/Dockerfile b/haskell_9.6-bullseye/Dockerfile
similarity index 83%
copy from haskell_latest/Dockerfile
copy to haskell_9.6-bullseye/Dockerfile
index 5690984..ffe069d 100644
--- a/haskell_latest/Dockerfile
+++ b/haskell_9.6-bullseye/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update && \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
-ARG STACK=2.15.7
+ARG STACK=2.15.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
RUN set -eux; \
@@ -33,10 +33,10 @@ RUN set -eux; \
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
case "$ARCH" in \
'aarch64') \
- STACK_SHA256='f0c4b038c7e895902e133a2f4c4c217e03c4be44aa5da48aec9f7947f4af090b'; \
+ STACK_SHA256='52cd9d9c2ee4dbf2841bba856f5fca15fbf6ba23fced7256aa3f7c8b76381c91'; \
;; \
'x86_64') \
- STACK_SHA256='4e635d6168f7578a5694a0d473c980c3c7ed35d971acae969de1fd48ef14e030'; \
+ STACK_SHA256='d55f8554932aad23f7b1198e0d5ebe332073d73fe60e3f324d0b315c156d8c43'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
@@ -94,20 +94,23 @@ RUN set -eux; \
\
cabal --version
-ARG GHC=9.10.1
-ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
+ARG GHC=9.6.6
+ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
RUN set -eux; \
cd /tmp; \
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
- GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
case "$ARCH" in \
'aarch64') \
- GHC_SHA256='1db449c445d34779d4deaba22341576f7b512a05b6c2b5cb64f3846d1509714e'; \
+ # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
+ # But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
+ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
+ GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
;; \
'x86_64') \
- GHC_SHA256='78975575b8125ecf1f50f78b1016b14ea6e87abbf1fc39797af469d029c5d737'; \
+ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
+ GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
diff --git a/haskell_slim/Dockerfile b/haskell_9.6-slim-bullseye/Dockerfile
similarity index 81%
copy from haskell_slim/Dockerfile
copy to haskell_9.6-slim-bullseye/Dockerfile
index bfcf91f..837726b 100644
--- a/haskell_slim/Dockerfile
+++ b/haskell_9.6-slim-bullseye/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update && \
zlib1g-dev && \
rm -rf /var/lib/apt/lists/*
-ARG STACK=2.15.7
+ARG STACK=2.15.5
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
RUN set -eux; \
@@ -33,10 +33,10 @@ RUN set -eux; \
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
case "$ARCH" in \
'aarch64') \
- STACK_SHA256='f0c4b038c7e895902e133a2f4c4c217e03c4be44aa5da48aec9f7947f4af090b'; \
+ STACK_SHA256='52cd9d9c2ee4dbf2841bba856f5fca15fbf6ba23fced7256aa3f7c8b76381c91'; \
;; \
'x86_64') \
- STACK_SHA256='4e635d6168f7578a5694a0d473c980c3c7ed35d971acae969de1fd48ef14e030'; \
+ STACK_SHA256='d55f8554932aad23f7b1198e0d5ebe332073d73fe60e3f324d0b315c156d8c43'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
@@ -94,20 +94,23 @@ RUN set -eux; \
\
cabal --version
-ARG GHC=9.10.1
-ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
+ARG GHC=9.6.6
+ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
RUN set -eux; \
cd /tmp; \
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
- GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
case "$ARCH" in \
'aarch64') \
- GHC_SHA256='1db449c445d34779d4deaba22341576f7b512a05b6c2b5cb64f3846d1509714e'; \
+ # Note: the 'aarch64-deb11' (bullseye) variant of images doesn't exist in https://downloads.haskell.org/~ghc/9.6.6/
+ # But deb10 (buster) images should be binary compatible with deb11, so using deb10 instead
+ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb10-linux.tar.xz"; \
+ GHC_SHA256='58d5ce65758ec5179b448e4e1a2f835924b4ada96cf56af80d011bed87d91fef'; \
;; \
'x86_64') \
- GHC_SHA256='78975575b8125ecf1f50f78b1016b14ea6e87abbf1fc39797af469d029c5d737'; \
+ GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
+ GHC_SHA256='a34bdfc1f65b000135d9c8eb12d69670026a64043a8b33ef5ba24b0f8e28d046'; \
;; \
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
esac; \
@@ -124,6 +127,8 @@ RUN set -eux; \
cd "ghc-$GHC-$ARCH-unknown-linux"; \
./configure --prefix "/opt/ghc/$GHC"; \
make install; \
+ # remove profiling support to save space
+ find "/opt/ghc/$GHC/" \( -name "*_p.a" -o -name "*.p_hi" \) -type f -delete; \
\
rm -rf /tmp/*; \
\Relevant Maintainers: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
aarch64 images use deb10 bindists, hope that's not a problem