diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md index f43744a303fff1012492b4314bd87eea43f8a4b9..d423073dfcf373a26cafbb1572eaf1d6867efb05 100644 --- a/VERSION_MATRIX.md +++ b/VERSION_MATRIX.md @@ -4,12 +4,12 @@ Topmost entry = Tag `latest` | GHC | Cabal | Stack | LLVM | Linux distro | |:-----------|:---------|:-----------|:---- |:-------------| -| 9.10.1 | 3.12.1.0 | 3.1.1 | 18 | Alpine 3.20 | -| 9.8.4 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 | +| 9.10.1 | 3.12.1.0 | 3.1.1 | 18 | Alpine 3.21 | +| 9.8.4 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.21 | | 9.8.3 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 | | 9.8.2 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 | | 9.8.1 | 3.10.2.1 | 2.15.1 | 14 | Alpine 3.19 | -| 9.6.6 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.20 | +| 9.6.6 | 3.10.3.0 | 3.1.1 | 16 | Alpine 3.21 | | 9.6.5 | 3.10.3.0 | 2.15.7 | 16 | Alpine 3.20 | | 9.6.4 | 3.10.3.0 | 2.15.5 | 14 | Alpine 3.19 | | 9.6.3 | 3.10.1.0 | 2.13.1 | 14 | Alpine 3.19 | diff --git a/latest.Dockerfile b/latest.Dockerfile index 4ecc97bbf126b6e2b625fcd19b6d50cc4018726c..9316579ba58a773a2847e2fcfaf435d3dba9279a 100644 --- a/latest.Dockerfile +++ b/latest.Dockerfile @@ -84,7 +84,7 @@ RUN cabal update \ ## See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history && cabal install "cabal-install-$CABAL_VERSION" -FROM alpine:3.20 AS ghc-base +FROM alpine:3.21 AS ghc-base ARG IMAGE_LICENSE="MIT" ARG IMAGE_SOURCE="https://gitlab.b-data.ch/ghc/ghc-musl" diff --git a/prior/9.6.6.Dockerfile b/prior/9.6.6.Dockerfile index e6701e11a6883eb1f2d538e692344a27942f0d86..92c66469e62c244d96dc2ba5fb3ba3ac803422c6 100644 --- a/prior/9.6.6.Dockerfile +++ b/prior/9.6.6.Dockerfile @@ -78,7 +78,7 @@ RUN cabal update \ ## See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history && cabal install "cabal-install-$CABAL_VERSION" -FROM alpine:3.20 AS ghc-base +FROM alpine:3.21 AS ghc-base LABEL org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.source="https://gitlab.b-data.ch/ghc/ghc-musl" \ diff --git a/prior/9.8.4.Dockerfile b/prior/9.8.4.Dockerfile index 90f4672beae75208e5848a0437eea681617784dd..e288ce20d2a904dcc84bf645b6fc44139f374f65 100644 --- a/prior/9.8.4.Dockerfile +++ b/prior/9.8.4.Dockerfile @@ -78,7 +78,7 @@ RUN cabal update \ ## See https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history && cabal install "cabal-install-$CABAL_VERSION" -FROM alpine:3.20 AS ghc-base +FROM alpine:3.21 AS ghc-base ARG IMAGE_LICENSE="MIT" ARG IMAGE_SOURCE="https://gitlab.b-data.ch/ghc/ghc-musl"