From f93fe0bd5c6649cc821ab7f8e959a322054fe798 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Wed, 22 May 2024 14:26:30 +0200 Subject: [PATCH] Add Alpine 3.20 and drop 3.18 --- 3.10/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.11/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.12/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.13-rc/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.8/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- 3.9/{alpine3.18 => alpine3.20}/Dockerfile | 2 +- versions.json | 18 +++++++++--------- versions.sh | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) rename 3.10/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.11/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.12/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.13-rc/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.8/{alpine3.18 => alpine3.20}/Dockerfile (99%) rename 3.9/{alpine3.18 => alpine3.20}/Dockerfile (99%) diff --git a/3.10/alpine3.18/Dockerfile b/3.10/alpine3.20/Dockerfile similarity index 99% rename from 3.10/alpine3.18/Dockerfile rename to 3.10/alpine3.20/Dockerfile index ea964d68d..6a97864fd 100644 --- a/3.10/alpine3.18/Dockerfile +++ b/3.10/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.11/alpine3.18/Dockerfile b/3.11/alpine3.20/Dockerfile similarity index 99% rename from 3.11/alpine3.18/Dockerfile rename to 3.11/alpine3.20/Dockerfile index 81e50ff7a..287a21d3e 100644 --- a/3.11/alpine3.18/Dockerfile +++ b/3.11/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.12/alpine3.18/Dockerfile b/3.12/alpine3.20/Dockerfile similarity index 99% rename from 3.12/alpine3.18/Dockerfile rename to 3.12/alpine3.20/Dockerfile index bb7f56840..a73e498a7 100644 --- a/3.12/alpine3.18/Dockerfile +++ b/3.12/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.13-rc/alpine3.18/Dockerfile b/3.13-rc/alpine3.20/Dockerfile similarity index 99% rename from 3.13-rc/alpine3.18/Dockerfile rename to 3.13-rc/alpine3.20/Dockerfile index e1127d509..fffad8120 100644 --- a/3.13-rc/alpine3.18/Dockerfile +++ b/3.13-rc/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.8/alpine3.18/Dockerfile b/3.8/alpine3.20/Dockerfile similarity index 99% rename from 3.8/alpine3.18/Dockerfile rename to 3.8/alpine3.20/Dockerfile index 68acefc0d..38b044828 100644 --- a/3.8/alpine3.18/Dockerfile +++ b/3.8/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/3.9/alpine3.18/Dockerfile b/3.9/alpine3.20/Dockerfile similarity index 99% rename from 3.9/alpine3.18/Dockerfile rename to 3.9/alpine3.20/Dockerfile index 113869c2d..536698247 100644 --- a/3.9/alpine3.18/Dockerfile +++ b/3.9/alpine3.20/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.18 +FROM alpine:3.20 # ensure local python is preferred over distribution python ENV PATH /usr/local/bin:$PATH diff --git a/versions.json b/versions.json index 6982e7cd4..27ad6954e 100644 --- a/versions.json +++ b/versions.json @@ -16,8 +16,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "3.10.14" }, @@ -38,8 +38,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.20", "alpine3.19", - "alpine3.18", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -59,8 +59,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.20", "alpine3.19", - "alpine3.18", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -80,8 +80,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", + "alpine3.20", "alpine3.19", - "alpine3.18", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], @@ -104,8 +104,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "3.8.19" }, @@ -126,8 +126,8 @@ "slim-bookworm", "bullseye", "slim-bullseye", - "alpine3.19", - "alpine3.18" + "alpine3.20", + "alpine3.19" ], "version": "3.9.19" } diff --git a/versions.sh b/versions.sh index 8b13d6fc7..ccd045303 100755 --- a/versions.sh +++ b/versions.sh @@ -194,8 +194,8 @@ for version in "${versions[@]}"; do empty | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 ( + "3.20", "3.19", - "3.18", empty | "alpine" + .), if env.hasWindows != "" then