From bb96c631cdae148eec0aca3fd0cbe15f485a61c2 Mon Sep 17 00:00:00 2001 From: Jenthe Noordsij Date: Wed, 10 Jun 2026 09:17:07 +0200 Subject: [PATCH] Add Alpine 3.24 and drop 3.22 --- 3.10/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.11/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.12/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.13/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.14/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- 3.15-rc/{alpine3.22 => alpine3.24}/Dockerfile | 2 +- versions.json | 18 +++++++++--------- versions.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename 3.10/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.11/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.12/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.13/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.14/{alpine3.22 => alpine3.24}/Dockerfile (99%) rename 3.15-rc/{alpine3.22 => alpine3.24}/Dockerfile (99%) diff --git a/3.10/alpine3.22/Dockerfile b/3.10/alpine3.24/Dockerfile similarity index 99% rename from 3.10/alpine3.22/Dockerfile rename to 3.10/alpine3.24/Dockerfile index e3be8f98a..c124d2671 100644 --- a/3.10/alpine3.22/Dockerfile +++ b/3.10/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.22/Dockerfile b/3.11/alpine3.24/Dockerfile similarity index 99% rename from 3.11/alpine3.22/Dockerfile rename to 3.11/alpine3.24/Dockerfile index d43ba24b8..2242114ab 100644 --- a/3.11/alpine3.22/Dockerfile +++ b/3.11/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.22/Dockerfile b/3.12/alpine3.24/Dockerfile similarity index 99% rename from 3.12/alpine3.22/Dockerfile rename to 3.12/alpine3.24/Dockerfile index 37c814fee..0cc30e764 100644 --- a/3.12/alpine3.22/Dockerfile +++ b/3.12/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13/alpine3.22/Dockerfile b/3.13/alpine3.24/Dockerfile similarity index 99% rename from 3.13/alpine3.22/Dockerfile rename to 3.13/alpine3.24/Dockerfile index 886d59a79..7869cdda1 100644 --- a/3.13/alpine3.22/Dockerfile +++ b/3.13/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.14/alpine3.22/Dockerfile b/3.14/alpine3.24/Dockerfile similarity index 99% rename from 3.14/alpine3.22/Dockerfile rename to 3.14/alpine3.24/Dockerfile index e5cbb3957..3002c9b24 100644 --- a/3.14/alpine3.22/Dockerfile +++ b/3.14/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.24/Dockerfile similarity index 99% rename from 3.15-rc/alpine3.22/Dockerfile rename to 3.15-rc/alpine3.24/Dockerfile index 6dcf70638..5a781b622 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.22 +FROM alpine:3.24 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index 4941b038d..33f30103e 100644 --- a/versions.json +++ b/versions.json @@ -13,8 +13,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "version": "3.10.20" }, @@ -32,8 +32,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "version": "3.11.15" }, @@ -48,8 +48,8 @@ "slim-trixie", "bookworm", "slim-bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], "version": "3.12.13" }, @@ -67,8 +67,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.24", "alpine3.23", - "alpine3.22", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -88,8 +88,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.24", "alpine3.23", - "alpine3.22", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -109,8 +109,8 @@ "slim-trixie", "bookworm", "slim-bookworm", + "alpine3.24", "alpine3.23", - "alpine3.22", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], diff --git a/versions.sh b/versions.sh index 83885bdb4..750fe82d3 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.24", "3.23", - "3.22", empty | "alpine" + .), if env.hasWindows != "" then