diff --git a/1.23/alpine3.20/Dockerfile b/1.23/alpine3.22/Dockerfile similarity index 99% rename from 1.23/alpine3.20/Dockerfile rename to 1.23/alpine3.22/Dockerfile index 45efb9eb..710c6aa2 100644 --- a/1.23/alpine3.20/Dockerfile +++ b/1.23/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 AS build +FROM alpine:3.22 AS build ENV PATH /usr/local/go/bin:$PATH @@ -110,7 +110,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM alpine:3.20 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/1.24/alpine3.20/Dockerfile b/1.24/alpine3.22/Dockerfile similarity index 99% rename from 1.24/alpine3.20/Dockerfile rename to 1.24/alpine3.22/Dockerfile index 6b6e5d8b..567f2a54 100644 --- a/1.24/alpine3.20/Dockerfile +++ b/1.24/alpine3.22/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 AS build +FROM alpine:3.22 AS build ENV PATH /usr/local/go/bin:$PATH @@ -110,7 +110,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM alpine:3.20 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/tip/alpine3.20/Dockerfile b/tip/alpine3.22/Dockerfile similarity index 97% rename from tip/alpine3.20/Dockerfile rename to tip/alpine3.22/Dockerfile index fda90da9..37ad7708 100644 --- a/tip/alpine3.20/Dockerfile +++ b/tip/alpine3.22/Dockerfile @@ -4,11 +4,11 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.20 AS build +FROM alpine:3.22 AS build ENV PATH /usr/local/go/bin:$PATH -COPY --from=golang:alpine3.20 /usr/local/go /usr/local/goroot-bootstrap +COPY --from=golang:alpine3.22 /usr/local/go /usr/local/goroot-bootstrap # tip-20250524: https://github.com/golang/go/tree/3fd729b2a14a7efcf08465cbea60a74da5457f06 ARG GOLANG_COMMIT='3fd729b2a14a7efcf08465cbea60a74da5457f06' @@ -110,7 +110,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM alpine:3.20 +FROM alpine:3.22 RUN apk add --no-cache ca-certificates diff --git a/versions.json b/versions.json index aae28a67..b355e312 100644 --- a/versions.json +++ b/versions.json @@ -394,8 +394,8 @@ "variants": [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", @@ -808,8 +808,8 @@ "variants": [ "bookworm", "bullseye", + "alpine3.22", "alpine3.21", - "alpine3.20", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809", @@ -916,8 +916,8 @@ "variants": [ "bookworm", "bullseye", - "alpine3.21", - "alpine3.20" + "alpine3.22", + "alpine3.21" ] } } diff --git a/versions.sh b/versions.sh index dbadd3b1..87812113 100755 --- a/versions.sh +++ b/versions.sh @@ -238,8 +238,8 @@ for version in "${versions[@]}"; do "bookworm", "bullseye", ( + "3.22", "3.21", - "3.20", empty | "alpine" + .), if .arches | has("windows-amd64") and .["windows-amd64"].url then # TODO consider windows + tip