From aad39d215779f27b410b25f612b6680a75781edb Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 3 Dec 2025 17:45:33 +0100 Subject: [PATCH] Add Alpine 3.23 and drop 3.21 --- 3.10/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.11/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.12/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.13/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.14/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- 3.15-rc/{alpine3.21 => alpine3.23}/Dockerfile | 2 +- versions.json | 18 +++++++++--------- versions.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename 3.10/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.11/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.12/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.13/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.14/{alpine3.21 => alpine3.23}/Dockerfile (99%) rename 3.15-rc/{alpine3.21 => alpine3.23}/Dockerfile (99%) diff --git a/3.10/alpine3.21/Dockerfile b/3.10/alpine3.23/Dockerfile similarity index 99% rename from 3.10/alpine3.21/Dockerfile rename to 3.10/alpine3.23/Dockerfile index 276fd33fa..bbde97a6f 100644 --- a/3.10/alpine3.21/Dockerfile +++ b/3.10/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.21/Dockerfile b/3.11/alpine3.23/Dockerfile similarity index 99% rename from 3.11/alpine3.21/Dockerfile rename to 3.11/alpine3.23/Dockerfile index 4192f0960..095e792f4 100644 --- a/3.11/alpine3.21/Dockerfile +++ b/3.11/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.21/Dockerfile b/3.12/alpine3.23/Dockerfile similarity index 99% rename from 3.12/alpine3.21/Dockerfile rename to 3.12/alpine3.23/Dockerfile index f5ed1422c..5ed1166d5 100644 --- a/3.12/alpine3.21/Dockerfile +++ b/3.12/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13/alpine3.21/Dockerfile b/3.13/alpine3.23/Dockerfile similarity index 99% rename from 3.13/alpine3.21/Dockerfile rename to 3.13/alpine3.23/Dockerfile index cef514c6c..3b38a174d 100644 --- a/3.13/alpine3.21/Dockerfile +++ b/3.13/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.14/alpine3.21/Dockerfile b/3.14/alpine3.23/Dockerfile similarity index 99% rename from 3.14/alpine3.21/Dockerfile rename to 3.14/alpine3.23/Dockerfile index 605c76725..c10a1a9d7 100644 --- a/3.14/alpine3.21/Dockerfile +++ b/3.14/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.15-rc/alpine3.21/Dockerfile b/3.15-rc/alpine3.23/Dockerfile similarity index 99% rename from 3.15-rc/alpine3.21/Dockerfile rename to 3.15-rc/alpine3.23/Dockerfile index 13071fa9d..9faa7c68f 100644 --- a/3.15-rc/alpine3.21/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 +FROM alpine:3.23 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index ce183bd98..648abffd0 100644 --- a/versions.json +++ b/versions.json @@ -13,8 +13,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "version": "3.10.19" }, @@ -32,8 +32,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "version": "3.11.14" }, @@ -48,8 +48,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ], "version": "3.12.12" }, @@ -67,8 +67,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.23", "alpine3.22", - "alpine3.21", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -88,8 +88,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.23", "alpine3.22", - "alpine3.21", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -109,8 +109,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.23", "alpine3.22", - "alpine3.21", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], diff --git a/versions.sh b/versions.sh index 9d8c20a24..83885bdb4 100755 --- a/versions.sh +++ b/versions.sh @@ -195,8 +195,8 @@ for version in "${versions[@]}"; do empty | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.23", "3.22", - "3.21", empty | "alpine" + .), if env.hasWindows != "" then