diff --git a/1.24/alpine3.21/Dockerfile b/1.24/alpine3.23/Dockerfile similarity index 99% rename from 1.24/alpine3.21/Dockerfile rename to 1.24/alpine3.23/Dockerfile index 4ba83c63..507fe9f0 100644 --- a/1.24/alpine3.21/Dockerfile +++ b/1.24/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 AS build +FROM alpine:3.23 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.21 +FROM alpine:3.23 RUN apk add --no-cache ca-certificates diff --git a/1.25/alpine3.21/Dockerfile b/1.25/alpine3.23/Dockerfile similarity index 99% rename from 1.25/alpine3.21/Dockerfile rename to 1.25/alpine3.23/Dockerfile index c05cb0ab..05b7bed0 100644 --- a/1.25/alpine3.21/Dockerfile +++ b/1.25/alpine3.23/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 AS build +FROM alpine:3.23 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.21 +FROM alpine:3.23 RUN apk add --no-cache ca-certificates diff --git a/tip/alpine3.21/Dockerfile b/tip/alpine3.23/Dockerfile similarity index 97% rename from tip/alpine3.21/Dockerfile rename to tip/alpine3.23/Dockerfile index 3439570d..b580eb53 100644 --- a/tip/alpine3.21/Dockerfile +++ b/tip/alpine3.23/Dockerfile @@ -4,11 +4,11 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM alpine:3.21 AS build +FROM alpine:3.23 AS build ENV PATH /usr/local/go/bin:$PATH -COPY --from=golang:alpine3.21 /usr/local/go /usr/local/goroot-bootstrap +COPY --from=golang:alpine3.23 /usr/local/go /usr/local/goroot-bootstrap # tip-20251128: https://github.com/golang/go/tree/3f94f3d4b2f03a913de3f5a737bad793418e751f ARG GOLANG_COMMIT='3f94f3d4b2f03a913de3f5a737bad793418e751f' @@ -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.21 +FROM alpine:3.23 RUN apk add --no-cache ca-certificates diff --git a/versions.json b/versions.json index db910720..8c75f17c 100644 --- a/versions.json +++ b/versions.json @@ -394,8 +394,8 @@ "variants": [ "trixie", "bookworm", + "alpine3.23", "alpine3.22", - "alpine3.21", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/nanoserver-ltsc2025", @@ -797,8 +797,8 @@ "variants": [ "trixie", "bookworm", + "alpine3.23", "alpine3.22", - "alpine3.21", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/nanoserver-ltsc2025", @@ -903,8 +903,8 @@ "variants": [ "trixie", "bookworm", - "alpine3.22", - "alpine3.21" + "alpine3.23", + "alpine3.22" ] } } diff --git a/versions.sh b/versions.sh index fc71233e..61297f44 100755 --- a/versions.sh +++ b/versions.sh @@ -238,8 +238,8 @@ for version in "${versions[@]}"; do "trixie", "bookworm", ( + "3.23", "3.22", - "3.21", empty | "alpine" + .), if .arches | has("windows-amd64") and .["windows-amd64"].url then # TODO consider windows + tip