From 7a8a43f0bd818b70b6856727c8ce87cd6f1ee26d Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 30 May 2025 13:54:43 -0700 Subject: [PATCH] Add Alpine 3.22 (remove Alpine 3.20) --- 1.10/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 1.10/{alpine3.20 => alpine3.22}/docker-entrypoint.sh | 0 1.11/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 1.11/{alpine3.20 => alpine3.22}/docker-entrypoint.sh | 0 1.12-rc/{alpine3.20 => alpine3.22}/Dockerfile | 2 +- 1.12-rc/{alpine3.20 => alpine3.22}/docker-entrypoint.sh | 0 versions.json | 6 +++--- versions.sh | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename 1.10/{alpine3.20 => alpine3.22}/Dockerfile (98%) rename 1.10/{alpine3.20 => alpine3.22}/docker-entrypoint.sh (100%) rename 1.11/{alpine3.20 => alpine3.22}/Dockerfile (98%) rename 1.11/{alpine3.20 => alpine3.22}/docker-entrypoint.sh (100%) rename 1.12-rc/{alpine3.20 => alpine3.22}/Dockerfile (98%) rename 1.12-rc/{alpine3.20 => alpine3.22}/docker-entrypoint.sh (100%) diff --git a/1.10/alpine3.20/Dockerfile b/1.10/alpine3.22/Dockerfile similarity index 98% rename from 1.10/alpine3.20/Dockerfile rename to 1.10/alpine3.22/Dockerfile index 767b6afe..4505e79b 100644 --- a/1.10/alpine3.20/Dockerfile +++ b/1.10/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 ENV JULIA_PATH /usr/local/julia ENV PATH $JULIA_PATH/bin:$PATH diff --git a/1.10/alpine3.20/docker-entrypoint.sh b/1.10/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 1.10/alpine3.20/docker-entrypoint.sh rename to 1.10/alpine3.22/docker-entrypoint.sh diff --git a/1.11/alpine3.20/Dockerfile b/1.11/alpine3.22/Dockerfile similarity index 98% rename from 1.11/alpine3.20/Dockerfile rename to 1.11/alpine3.22/Dockerfile index 9ae047f8..6a6117d7 100644 --- a/1.11/alpine3.20/Dockerfile +++ b/1.11/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 ENV JULIA_PATH /usr/local/julia ENV PATH $JULIA_PATH/bin:$PATH diff --git a/1.11/alpine3.20/docker-entrypoint.sh b/1.11/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 1.11/alpine3.20/docker-entrypoint.sh rename to 1.11/alpine3.22/docker-entrypoint.sh diff --git a/1.12-rc/alpine3.20/Dockerfile b/1.12-rc/alpine3.22/Dockerfile similarity index 98% rename from 1.12-rc/alpine3.20/Dockerfile rename to 1.12-rc/alpine3.22/Dockerfile index b0fbd776..b0e9c463 100644 --- a/1.12-rc/alpine3.20/Dockerfile +++ b/1.12-rc/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 +FROM alpine:3.22 ENV JULIA_PATH /usr/local/julia ENV PATH $JULIA_PATH/bin:$PATH diff --git a/1.12-rc/alpine3.20/docker-entrypoint.sh b/1.12-rc/alpine3.22/docker-entrypoint.sh similarity index 100% rename from 1.12-rc/alpine3.20/docker-entrypoint.sh rename to 1.12-rc/alpine3.22/docker-entrypoint.sh diff --git a/versions.json b/versions.json index 276cbf38..0791ae8d 100644 --- a/versions.json +++ b/versions.json @@ -45,8 +45,8 @@ "variants": [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" @@ -99,8 +99,8 @@ "variants": [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" @@ -150,8 +150,8 @@ "variants": [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" diff --git a/versions.sh b/versions.sh index c2884468..2daaec24 100755 --- a/versions.sh +++ b/versions.sh @@ -104,8 +104,8 @@ for version in "${versions[@]}"; do "bookworm", "bullseye", if .arches | keys | any(startswith("alpine-")) then + "3.22", "3.21", - "3.20", empty | "alpine" + . else empty end,