From db26db9362a74467ec74c21665b87663ac3a58ba Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 11:04:31 +0100 Subject: [PATCH 1/2] Add Alpine 3.19 and drop 3.17 to versions.sh --- versions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.sh b/versions.sh index fa8b73f8e..2677cfbd8 100755 --- a/versions.sh +++ b/versions.sh @@ -192,8 +192,8 @@ for version in "${versions[@]}"; do empty | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.19", "3.18", - "3.17", empty | "alpine" + .), if env.hasWindows != "" then From 789d789e4a8db71d3d393667971c49b845ffdc3f Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Thu, 7 Dec 2023 11:04:53 +0100 Subject: [PATCH 2/2] Update templates to add Alpine 3.19 and drop 3.17 --- 3.10/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.11/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.12/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.13-rc/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.8/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- 3.9/{alpine3.17 => alpine3.19}/Dockerfile | 2 +- versions.json | 18 +++++++++--------- 7 files changed, 15 insertions(+), 15 deletions(-) rename 3.10/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.11/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.12/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.13-rc/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.8/{alpine3.17 => alpine3.19}/Dockerfile (99%) rename 3.9/{alpine3.17 => alpine3.19}/Dockerfile (99%) diff --git a/3.10/alpine3.17/Dockerfile b/3.10/alpine3.19/Dockerfile similarity index 99% rename from 3.10/alpine3.17/Dockerfile rename to 3.10/alpine3.19/Dockerfile index 6546ae1ec..76d0e28a4 100644 --- a/3.10/alpine3.17/Dockerfile +++ b/3.10/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.17/Dockerfile b/3.11/alpine3.19/Dockerfile similarity index 99% rename from 3.11/alpine3.17/Dockerfile rename to 3.11/alpine3.19/Dockerfile index be672f126..ffc0322fd 100644 --- a/3.11/alpine3.17/Dockerfile +++ b/3.11/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.17/Dockerfile b/3.12/alpine3.19/Dockerfile similarity index 99% rename from 3.12/alpine3.17/Dockerfile rename to 3.12/alpine3.19/Dockerfile index 15093b7a6..ac1b23d6f 100644 --- a/3.12/alpine3.17/Dockerfile +++ b/3.12/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13-rc/alpine3.17/Dockerfile b/3.13-rc/alpine3.19/Dockerfile similarity index 99% rename from 3.13-rc/alpine3.17/Dockerfile rename to 3.13-rc/alpine3.19/Dockerfile index 828771560..8d8082abe 100644 --- a/3.13-rc/alpine3.17/Dockerfile +++ b/3.13-rc/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.8/alpine3.17/Dockerfile b/3.8/alpine3.19/Dockerfile similarity index 99% rename from 3.8/alpine3.17/Dockerfile rename to 3.8/alpine3.19/Dockerfile index d5a72bb55..eb3a77004 100644 --- a/3.8/alpine3.17/Dockerfile +++ b/3.8/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.9/alpine3.17/Dockerfile b/3.9/alpine3.19/Dockerfile similarity index 99% rename from 3.9/alpine3.17/Dockerfile rename to 3.9/alpine3.19/Dockerfile index b6448b87b..deeba0842 100644 --- a/3.9/alpine3.17/Dockerfile +++ b/3.9/alpine3.19/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.17 +FROM alpine:3.19 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index 56d52ccf6..78a3229a3 100644 --- a/versions.json +++ b/versions.json @@ -16,8 +16,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.10.13" }, @@ -38,8 +38,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.19", "alpine3.18", - "alpine3.17", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -59,8 +59,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.19", "alpine3.18", - "alpine3.17", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -80,8 +80,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.19", "alpine3.18", - "alpine3.17", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -104,8 +104,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.8.18" }, @@ -126,8 +126,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.18", - "alpine3.17" + "alpine3.19", + "alpine3.18" ], "version": "3.9.18" }