From 47a296425e25ae641f124998c379ea4b42015d5b Mon Sep 17 00:00:00 2001
From: Olivier Benz <olivier.benz@b-data.ch>
Date: Fri, 6 Dec 2024 15:14:06 +0100
Subject: [PATCH] Update base image to alpine:3.21
---
VERSION_MATRIX.md | 6 +++---
latest.Dockerfile | 2 +-
prior/9.6.6.Dockerfile | 2 +-
prior/9.8.4.Dockerfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/VERSION_MATRIX.md b/VERSION_MATRIX.md
index f43744a..d423073 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 4ecc97b..9316579 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 e6701e1..92c6646 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 90f4672..e288ce2 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"
--
GitLab