Skip to content

Commit 36206e8

Browse files
Totto16Totto16
authored
feat: Bump GHC 9.8.4 + add bullseye image for 9.8.4 (#143)
* Bump GHC 9.8.4 * Add bullseye variant of 9.8.4 images
1 parent 62d579a commit 36206e8

File tree

5 files changed

+291
-12
lines changed

5 files changed

+291
-12
lines changed

‎.github/workflows/debian.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
ghc: ['9.10.1', '9.8.2', '9.6.6', '9.4.8', '9.2.8', '9.0.2' ]
27+
ghc: ['9.10.1', '9.8.4', '9.6.6', '9.4.8', '9.2.8', '9.0.2' ]
2828
deb: ['buster', 'slim-buster']
2929
include:
3030
- ghc: '9.10.1'
@@ -35,7 +35,13 @@ jobs:
3535
deb: 'bullseye'
3636
- ghc: '9.10.1'
3737
ghc_minor: '9.10'
38-
- ghc: '9.8.2'
38+
- ghc: '9.8.4'
39+
ghc_minor: '9.8'
40+
deb: 'slim-bullseye'
41+
- ghc: '9.8.4'
42+
ghc_minor: '9.8'
43+
deb: 'bullseye'
44+
- ghc: '9.8.4'
3945
ghc_minor: '9.8'
4046
- ghc: '9.6.6'
4147
ghc_minor: '9.6'
@@ -77,7 +83,7 @@ jobs:
7783
strategy:
7884
fail-fast: false
7985
matrix:
80-
ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.2', '9.10.1']
86+
ghc: ['9.0.2', '9.2.8', '9.4.8', '9.6.6', '9.8.4', '9.10.1']
8187
# uraimo/run-on-arch-action does not support debian slim variants
8288
deb: ['buster']
8389
arch: ['aarch64']
@@ -88,6 +94,11 @@ jobs:
8894
deb: 'bullseye'
8995
arch: 'aarch64'
9096
docker_platform: arm64
97+
- ghc: '9.8.4'
98+
ghc_minor: '9.8'
99+
deb: 'bullseye'
100+
arch: 'aarch64'
101+
docker_platform: arm64
91102
- ghc: '9.6.6'
92103
ghc_minor: '9.6'
93104
deb: 'bullseye'
@@ -96,7 +107,7 @@ jobs:
96107
# buster (debian 10)
97108
- ghc: '9.10.1'
98109
ghc_minor: '9.10'
99-
- ghc: '9.8.2'
110+
- ghc: '9.8.4'
100111
ghc_minor: '9.8'
101112
- ghc: '9.6.6'
102113
ghc_minor: '9.6'

‎9.8/bullseye/Dockerfile

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
FROM debian:bullseye
2+
3+
ENV LANG C.UTF-8
4+
5+
# common haskell + stack dependencies
6+
RUN apt-get update && \
7+
apt-get install -y --no-install-recommends \
8+
ca-certificates \
9+
curl \
10+
dpkg-dev \
11+
git \
12+
gcc \
13+
gnupg \
14+
g++ \
15+
libc6-dev \
16+
libffi-dev \
17+
libgmp-dev \
18+
libnuma-dev \
19+
libtinfo-dev \
20+
make \
21+
netbase \
22+
xz-utils \
23+
zlib1g-dev && \
24+
rm -rf /var/lib/apt/lists/*
25+
26+
ARG STACK=3.1.1
27+
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
28+
29+
RUN set -eux; \
30+
cd /tmp; \
31+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
32+
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
33+
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
34+
case "$ARCH" in \
35+
'aarch64') \
36+
STACK_SHA256='033cb75bad3a5299b522c99e8056915bd081879f5df312e6d44d7511fc567455'; \
37+
;; \
38+
'x86_64') \
39+
STACK_SHA256='d096125ea3d987a55d17f7d4f8599ee2fd96bd2d0f033566e28ddfe248f730f9'; \
40+
;; \
41+
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
42+
esac; \
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;
59+
60+
ARG CABAL_INSTALL=3.10.3.0
61+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
62+
63+
RUN set -eux; \
64+
cd /tmp; \
65+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
66+
CABAL_INSTALL_TAR="cabal-install-$CABAL_INSTALL-$ARCH-linux-deb11.tar.xz"; \
67+
CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/$CABAL_INSTALL_TAR"; \
68+
CABAL_INSTALL_SHA256SUMS_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS"; \
69+
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
70+
case "$ARCH" in \
71+
'aarch64') \
72+
CABAL_INSTALL_SHA256='e0b6604d3596c5e5b7236e79ff4f5aa8af337792bf69ac4a90634c761f1b9ed5'; \
73+
;; \
74+
'x86_64') \
75+
CABAL_INSTALL_SHA256='12d018bdd07efed470f278f22d94b33655c4fcbc44d28d97b5ebb7944d5607c5'; \
76+
;; \
77+
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
78+
esac; \
79+
curl -fSL "$CABAL_INSTALL_URL" -o cabal-install.tar.gz; \
80+
echo "$CABAL_INSTALL_SHA256 cabal-install.tar.gz" | sha256sum --strict --check; \
81+
\
82+
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL"; \
83+
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL.sig"; \
84+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
85+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY"; \
86+
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
87+
# confirm we are verifying SHA256SUMS that matches the release + sha256
88+
grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
89+
gpgconf --kill all; \
90+
\
91+
tar -xf cabal-install.tar.gz -C /usr/local/bin; \
92+
\
93+
rm -rf /tmp/*; \
94+
\
95+
cabal --version
96+
97+
ARG GHC=9.8.4
98+
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
99+
100+
RUN set -eux; \
101+
cd /tmp; \
102+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
103+
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
104+
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
105+
case "$ARCH" in \
106+
'aarch64') \
107+
GHC_SHA256='310204daf2df6ad16087be94b3498ca414a0953b29e94e8ec8eb4a5c9bf603d3'; \
108+
;; \
109+
'x86_64') \
110+
GHC_SHA256='af151db8682b8c763f5a44f960f65453d794c95b60f151abc82dbdefcbe6f8ad'; \
111+
;; \
112+
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
113+
esac; \
114+
curl -sSL "$GHC_URL" -o ghc.tar.xz; \
115+
echo "$GHC_SHA256 ghc.tar.xz" | sha256sum --strict --check; \
116+
\
117+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
118+
curl -sSL "$GHC_URL.sig" -o ghc.tar.xz.sig; \
119+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_KEY"; \
120+
gpg --batch --verify ghc.tar.xz.sig ghc.tar.xz; \
121+
gpgconf --kill all; \
122+
\
123+
tar xf ghc.tar.xz; \
124+
cd "ghc-$GHC-$ARCH-unknown-linux"; \
125+
./configure --prefix "/opt/ghc/$GHC"; \
126+
make install; \
127+
\
128+
rm -rf /tmp/*; \
129+
\
130+
"/opt/ghc/$GHC/bin/ghc" --version
131+
132+
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
133+
134+
CMD ["ghci"]

‎9.8/buster/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ RUN set -eux; \
8080
\
8181
cabal --version
8282

83-
ARG GHC=9.8.2
84-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
83+
ARG GHC=9.8.4
84+
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
8585

8686
RUN set -eux; \
8787
cd /tmp; \
@@ -90,10 +90,10 @@ RUN set -eux; \
9090
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
9191
case "$ARCH" in \
9292
'aarch64') \
93-
GHC_SHA256='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \
93+
GHC_SHA256='15cf9341437af2c6f75bbaf8222824f5b51c32f0637ed054513f165999b0a87d'; \
9494
;; \
9595
'x86_64') \
96-
GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \
96+
GHC_SHA256='26bc72eb2758a3df14a4a88193d116d2cf334c2a20892b401f5cd3f82e6d346c'; \
9797
;; \
9898
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
9999
esac; \

‎9.8/slim-bullseye/Dockerfile

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
FROM debian:bullseye-slim
2+
3+
ENV LANG C.UTF-8
4+
5+
# common haskell + stack dependencies
6+
RUN apt-get update && \
7+
apt-get install -y --no-install-recommends \
8+
ca-certificates \
9+
curl \
10+
dpkg-dev \
11+
git \
12+
gcc \
13+
gnupg \
14+
g++ \
15+
libc6-dev \
16+
libffi-dev \
17+
libgmp-dev \
18+
libnuma-dev \
19+
libtinfo-dev \
20+
make \
21+
netbase \
22+
xz-utils \
23+
zlib1g-dev && \
24+
rm -rf /var/lib/apt/lists/*
25+
26+
ARG STACK=3.1.1
27+
ARG STACK_RELEASE_KEY=C5705533DA4F78D8664B5DC0575159689BEFB442
28+
29+
RUN set -eux; \
30+
cd /tmp; \
31+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
32+
STACK_URL="https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz"; \
33+
# sha256 from https://github.com/commercialhaskell/stack/releases/download/v${STACK}/stack-${STACK}-linux-$ARCH.tar.gz.sha256
34+
case "$ARCH" in \
35+
'aarch64') \
36+
STACK_SHA256='033cb75bad3a5299b522c99e8056915bd081879f5df312e6d44d7511fc567455'; \
37+
;; \
38+
'x86_64') \
39+
STACK_SHA256='d096125ea3d987a55d17f7d4f8599ee2fd96bd2d0f033566e28ddfe248f730f9'; \
40+
;; \
41+
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
42+
esac; \
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;
59+
60+
ARG CABAL_INSTALL=3.10.3.0
61+
ARG CABAL_INSTALL_RELEASE_KEY=EAF2A9A722C0C96F2B431CA511AAD8CEDEE0CAEF
62+
63+
RUN set -eux; \
64+
cd /tmp; \
65+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
66+
CABAL_INSTALL_TAR="cabal-install-$CABAL_INSTALL-$ARCH-linux-deb11.tar.xz"; \
67+
CABAL_INSTALL_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/$CABAL_INSTALL_TAR"; \
68+
CABAL_INSTALL_SHA256SUMS_URL="https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS"; \
69+
# sha256 from https://downloads.haskell.org/~cabal/cabal-install-$CABAL_INSTALL/SHA256SUMS
70+
case "$ARCH" in \
71+
'aarch64') \
72+
CABAL_INSTALL_SHA256='e0b6604d3596c5e5b7236e79ff4f5aa8af337792bf69ac4a90634c761f1b9ed5'; \
73+
;; \
74+
'x86_64') \
75+
CABAL_INSTALL_SHA256='12d018bdd07efed470f278f22d94b33655c4fcbc44d28d97b5ebb7944d5607c5'; \
76+
;; \
77+
*) echo >&2 "error: unsupported architecture '$ARCH'"; exit 1 ;; \
78+
esac; \
79+
curl -fSL "$CABAL_INSTALL_URL" -o cabal-install.tar.gz; \
80+
echo "$CABAL_INSTALL_SHA256 cabal-install.tar.gz" | sha256sum --strict --check; \
81+
\
82+
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL"; \
83+
curl -sSLO "$CABAL_INSTALL_SHA256SUMS_URL.sig"; \
84+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
85+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$CABAL_INSTALL_RELEASE_KEY"; \
86+
gpg --batch --verify SHA256SUMS.sig SHA256SUMS; \
87+
# confirm we are verifying SHA256SUMS that matches the release + sha256
88+
grep "$CABAL_INSTALL_SHA256 $CABAL_INSTALL_TAR" SHA256SUMS; \
89+
gpgconf --kill all; \
90+
\
91+
tar -xf cabal-install.tar.gz -C /usr/local/bin; \
92+
\
93+
rm -rf /tmp/*; \
94+
\
95+
cabal --version
96+
97+
ARG GHC=9.8.4
98+
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
99+
100+
RUN set -eux; \
101+
cd /tmp; \
102+
ARCH="$(dpkg-architecture --query DEB_BUILD_GNU_CPU)"; \
103+
GHC_URL="https://downloads.haskell.org/~ghc/$GHC/ghc-$GHC-$ARCH-deb11-linux.tar.xz"; \
104+
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
105+
case "$ARCH" in \
106+
'aarch64') \
107+
GHC_SHA256='310204daf2df6ad16087be94b3498ca414a0953b29e94e8ec8eb4a5c9bf603d3'; \
108+
;; \
109+
'x86_64') \
110+
GHC_SHA256='af151db8682b8c763f5a44f960f65453d794c95b60f151abc82dbdefcbe6f8ad'; \
111+
;; \
112+
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
113+
esac; \
114+
curl -sSL "$GHC_URL" -o ghc.tar.xz; \
115+
echo "$GHC_SHA256 ghc.tar.xz" | sha256sum --strict --check; \
116+
\
117+
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
118+
curl -sSL "$GHC_URL.sig" -o ghc.tar.xz.sig; \
119+
gpg --batch --keyserver keyserver.ubuntu.com --receive-keys "$GHC_RELEASE_KEY"; \
120+
gpg --batch --verify ghc.tar.xz.sig ghc.tar.xz; \
121+
gpgconf --kill all; \
122+
\
123+
tar xf ghc.tar.xz; \
124+
cd "ghc-$GHC-$ARCH-unknown-linux"; \
125+
./configure --prefix "/opt/ghc/$GHC"; \
126+
make install; \
127+
\
128+
rm -rf /tmp/*; \
129+
\
130+
"/opt/ghc/$GHC/bin/ghc" --version
131+
132+
ENV PATH /root/.cabal/bin:/root/.local/bin:/opt/ghc/${GHC}/bin:$PATH
133+
134+
CMD ["ghci"]

‎9.8/slim-buster/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ RUN set -eux; \
9494
\
9595
cabal --version
9696

97-
ARG GHC=9.8.2
98-
ARG GHC_RELEASE_KEY=88B57FCF7DB53B4DB3BFA4B1588764FBE22D19C4
97+
ARG GHC=9.8.4
98+
ARG GHC_RELEASE_KEY=FFEB7CE81E16A36B3E2DED6F2DE04D4E97DB64AD
9999

100100
RUN set -eux; \
101101
cd /tmp; \
@@ -104,10 +104,10 @@ RUN set -eux; \
104104
# sha256 from https://downloads.haskell.org/~ghc/$GHC/SHA256SUMS
105105
case "$ARCH" in \
106106
'aarch64') \
107-
GHC_SHA256='9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575'; \
107+
GHC_SHA256='15cf9341437af2c6f75bbaf8222824f5b51c32f0637ed054513f165999b0a87d'; \
108108
;; \
109109
'x86_64') \
110-
GHC_SHA256='7449e1c8ef351ec326f36d9eba2885ba7b75d9900df35b2069c4d6fd151b09eb'; \
110+
GHC_SHA256='26bc72eb2758a3df14a4a88193d116d2cf334c2a20892b401f5cd3f82e6d346c'; \
111111
;; \
112112
*) echo >&2 "error: unsupported architecture '$ARCH'" ; exit 1 ;; \
113113
esac; \

0 commit comments

Comments
 (0)