From 3d7b328b66525fe2e82af7063af10c176b6ee8cd Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 5 Dec 2024 14:19:52 +0100 Subject: [PATCH] Add Alpine 3.21 and drop 3.19 --- 3.10/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.11/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.12/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.13/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.14-rc/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- 3.9/{alpine3.19 => alpine3.21}/Dockerfile | 2 +- versions.json | 18 +++++++++--------- versions.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename 3.10/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.11/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.12/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.13/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.14-rc/{alpine3.19 => alpine3.21}/Dockerfile (99%) rename 3.9/{alpine3.19 => alpine3.21}/Dockerfile (99%) diff --git a/3.10/alpine3.19/Dockerfile b/3.10/alpine3.21/Dockerfile similarity index 99% rename from 3.10/alpine3.19/Dockerfile rename to 3.10/alpine3.21/Dockerfile index 5fe542077..5e63d52c4 100644 --- a/3.10/alpine3.19/Dockerfile +++ b/3.10/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.19/Dockerfile b/3.11/alpine3.21/Dockerfile similarity index 99% rename from 3.11/alpine3.19/Dockerfile rename to 3.11/alpine3.21/Dockerfile index ee2716213..eaf1886e0 100644 --- a/3.11/alpine3.19/Dockerfile +++ b/3.11/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.19/Dockerfile b/3.12/alpine3.21/Dockerfile similarity index 99% rename from 3.12/alpine3.19/Dockerfile rename to 3.12/alpine3.21/Dockerfile index 1e0fb73bd..4bc600f39 100644 --- a/3.12/alpine3.19/Dockerfile +++ b/3.12/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13/alpine3.19/Dockerfile b/3.13/alpine3.21/Dockerfile similarity index 99% rename from 3.13/alpine3.19/Dockerfile rename to 3.13/alpine3.21/Dockerfile index bb92320e0..47fda0dbc 100644 --- a/3.13/alpine3.19/Dockerfile +++ b/3.13/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.14-rc/alpine3.19/Dockerfile b/3.14-rc/alpine3.21/Dockerfile similarity index 99% rename from 3.14-rc/alpine3.19/Dockerfile rename to 3.14-rc/alpine3.21/Dockerfile index 724276604..d2d9bfda6 100644 --- a/3.14-rc/alpine3.19/Dockerfile +++ b/3.14-rc/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.9/alpine3.19/Dockerfile b/3.9/alpine3.21/Dockerfile similarity index 99% rename from 3.9/alpine3.19/Dockerfile rename to 3.9/alpine3.21/Dockerfile index 3be566306..23a662fcb 100644 --- a/3.9/alpine3.19/Dockerfile +++ b/3.9/alpine3.21/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.19 +FROM alpine:3.21 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index b6f01535d..eccbff484 100644 --- a/versions.json +++ b/versions.json @@ -13,8 +13,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "version": "3.10.16" }, @@ -32,8 +32,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "version": "3.11.11" }, @@ -51,8 +51,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.21", "alpine3.20", - "alpine3.19", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -72,8 +72,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.21", "alpine3.20", - "alpine3.19", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -93,8 +93,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.21", "alpine3.20", - "alpine3.19", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -114,8 +114,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.20", - "alpine3.19" + "alpine3.21", + "alpine3.20" ], "version": "3.9.21" } diff --git a/versions.sh b/versions.sh index 53c0498c4..5b7014ef7 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.21", "3.20", - "3.19", empty | "alpine" + .), if env.hasWindows != "" then