From 6785f2adeba05201537f991bf70d5e3985278826 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 4 Dec 2025 11:55:18 -0800 Subject: [PATCH] Update to Alpine 3.23 Drop Alpine 3.21 accordingly --- 3.2/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.3/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.4/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 4.0-rc/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.2/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.3/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.4/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 4.0-rc/{alpine3.21 => alpine3.23}/Dockerfile (99%) diff --git a/3.2/alpine3.21/Dockerfile b/3.2/alpine3.23/Dockerfile similarity index 99% rename from 3.2/alpine3.21/Dockerfile rename to 3.2/alpine3.23/Dockerfile index 0e0658c3a..5ff74f74b 100644 --- a/3.2/alpine3.21/Dockerfile +++ b/3.2/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.3/alpine3.21/Dockerfile b/3.3/alpine3.23/Dockerfile similarity index 99% rename from 3.3/alpine3.21/Dockerfile rename to 3.3/alpine3.23/Dockerfile index fbc8adc15..382f1daae 100644 --- a/3.3/alpine3.21/Dockerfile +++ b/3.3/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.4/alpine3.21/Dockerfile b/3.4/alpine3.23/Dockerfile similarity index 99% rename from 3.4/alpine3.21/Dockerfile rename to 3.4/alpine3.23/Dockerfile index cf78c1bd5..1ba3b38f0 100644 --- a/3.4/alpine3.21/Dockerfile +++ b/3.4/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/4.0-rc/alpine3.21/Dockerfile b/4.0-rc/alpine3.23/Dockerfile similarity index 99% rename from 4.0-rc/alpine3.21/Dockerfile rename to 4.0-rc/alpine3.23/Dockerfile index be1dfcf85..a05d31240 100644 --- a/4.0-rc/alpine3.21/Dockerfile +++ b/4.0-rc/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/versions.json b/versions.json index ae1a1a0d6..ffc2355de 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -103,8 +103,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -173,8 +173,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" @@ -250,8 +250,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "rust": { "version": "1.84.0" diff --git a/versions.sh b/versions.sh index 3e9a90c91..e7750774f 100755 --- a/versions.sh +++ b/versions.sh @@ -88,8 +88,8 @@ for version in "${versions[@]}"; do empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.23", "3.22", - "3.21", empty # trailing comma hack | "alpine" + .) ]