diff --git a/3.10/alpine3.20/Dockerfile b/3.10/alpine3.22/Dockerfile similarity index 99% rename from 3.10/alpine3.20/Dockerfile rename to 3.10/alpine3.22/Dockerfile index 0fed3b855..3d41ec6cc 100644 --- a/3.10/alpine3.20/Dockerfile +++ b/3.10/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.20/Dockerfile b/3.11/alpine3.22/Dockerfile similarity index 99% rename from 3.11/alpine3.20/Dockerfile rename to 3.11/alpine3.22/Dockerfile index 5d5a0be1a..3e2e98937 100644 --- a/3.11/alpine3.20/Dockerfile +++ b/3.11/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.20/Dockerfile b/3.12/alpine3.22/Dockerfile similarity index 99% rename from 3.12/alpine3.20/Dockerfile rename to 3.12/alpine3.22/Dockerfile index 9519e47a9..d3b1a4847 100644 --- a/3.12/alpine3.20/Dockerfile +++ b/3.12/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13/alpine3.20/Dockerfile b/3.13/alpine3.22/Dockerfile similarity index 99% rename from 3.13/alpine3.20/Dockerfile rename to 3.13/alpine3.22/Dockerfile index c3b9eb310..3be6d5bcb 100644 --- a/3.13/alpine3.20/Dockerfile +++ b/3.13/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.14-rc/alpine3.20/Dockerfile b/3.14-rc/alpine3.22/Dockerfile similarity index 99% rename from 3.14-rc/alpine3.20/Dockerfile rename to 3.14-rc/alpine3.22/Dockerfile index 70e5d43be..87d223fc3 100644 --- a/3.14-rc/alpine3.20/Dockerfile +++ b/3.14-rc/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.9/alpine3.20/Dockerfile b/3.9/alpine3.22/Dockerfile similarity index 99% rename from 3.9/alpine3.20/Dockerfile rename to 3.9/alpine3.22/Dockerfile index 35e8fef9c..26f0b3238 100644 --- a/3.9/alpine3.20/Dockerfile +++ b/3.9/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index 9115bb4c4..c49e9bf51 100644 --- a/versions.json +++ b/versions.json @@ -13,8 +13,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "3.10.17" }, @@ -32,8 +32,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "3.11.12" }, @@ -51,8 +51,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -72,8 +72,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -93,8 +93,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], @@ -114,8 +114,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ], "version": "3.9.22" } diff --git a/versions.sh b/versions.sh index b84ab4a64..d4ac179b8 100755 --- a/versions.sh +++ b/versions.sh @@ -200,8 +200,8 @@ for version in "${versions[@]}"; do empty | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.22", "3.21", - "3.20", empty | "alpine" + .), if env.hasWindows != "" then