From c79256398297d00ad8c393ef2a596767954b6042 Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:28:03 +0100 Subject: [PATCH] https://alpinelinux.org/posts/Alpine-3.21.0-released.html As customary, drop alpine 3.19 --- 3.1/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.2/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.3/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.4-rc/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- versions.json | 16 ++++++++-------- versions.sh | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename 3.1/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.2/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.3/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.4-rc/{alpine3.19 => alpine3.21}/Dockerfile (99%) diff --git a/3.1/alpine3.19/Dockerfile b/3.1/alpine3.21/Dockerfile similarity index 99% rename from 3.1/alpine3.19/Dockerfile rename to 3.1/alpine3.21/Dockerfile index 94b5ec47b4..fea4377ce6 100644 --- a/3.1/alpine3.19/Dockerfile +++ b/3.1/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.2/alpine3.19/Dockerfile b/3.2/alpine3.21/Dockerfile similarity index 99% rename from 3.2/alpine3.19/Dockerfile rename to 3.2/alpine3.21/Dockerfile index 34702e7fab..baf89084a7 100644 --- a/3.2/alpine3.19/Dockerfile +++ b/3.2/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.3/alpine3.19/Dockerfile b/3.3/alpine3.21/Dockerfile similarity index 99% rename from 3.3/alpine3.19/Dockerfile rename to 3.3/alpine3.21/Dockerfile index cd3ef78009..f09af2234c 100644 --- a/3.3/alpine3.19/Dockerfile +++ b/3.3/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/3.4-rc/alpine3.19/Dockerfile b/3.4-rc/alpine3.21/Dockerfile similarity index 99% rename from 3.4-rc/alpine3.19/Dockerfile rename to 3.4-rc/alpine3.21/Dockerfile index 49045d4c48..07c7820f05 100644 --- a/3.4-rc/alpine3.19/Dockerfile +++ b/3.4-rc/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 RUN set -eux; \ apk add --no-cache \ diff --git a/versions.json b/versions.json index a79aa0fced..e614243702 100644 --- a/versions.json +++ b/versions.json @@ -33,8 +33,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ] }, "3.2": { @@ -71,8 +71,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" @@ -141,8 +141,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" @@ -218,8 +218,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "rust": { "version": "1.74.1" diff --git a/versions.sh b/versions.sh index aa5e6bc116..64bf090ebe 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.21", "3.20", - "3.19", empty # trailing comma hack | "alpine" + .) ]