diff --git a/1.23/bullseye/Dockerfile b/1.23/trixie/Dockerfile similarity index 98% rename from 1.23/bullseye/Dockerfile rename to 1.23/trixie/Dockerfile index ec4f340b..7a85bc47 100644 --- a/1.23/bullseye/Dockerfile +++ b/1.23/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm AS build +FROM buildpack-deps:trixie-scm AS build ENV PATH /usr/local/go/bin:$PATH @@ -102,7 +102,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm # install cgo-related dependencies RUN set -eux; \ diff --git a/1.24/bullseye/Dockerfile b/1.24/trixie/Dockerfile similarity index 98% rename from 1.24/bullseye/Dockerfile rename to 1.24/trixie/Dockerfile index 3cf61288..fe6900f9 100644 --- a/1.24/bullseye/Dockerfile +++ b/1.24/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm AS build +FROM buildpack-deps:trixie-scm AS build ENV PATH /usr/local/go/bin:$PATH @@ -102,7 +102,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm # install cgo-related dependencies RUN set -eux; \ diff --git a/1.25-rc/bullseye/Dockerfile b/1.25-rc/trixie/Dockerfile similarity index 98% rename from 1.25-rc/bullseye/Dockerfile rename to 1.25-rc/trixie/Dockerfile index 29af098b..e6366872 100644 --- a/1.25-rc/bullseye/Dockerfile +++ b/1.25-rc/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm AS build +FROM buildpack-deps:trixie-scm AS build ENV PATH /usr/local/go/bin:$PATH @@ -102,7 +102,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm # install cgo-related dependencies RUN set -eux; \ diff --git a/tip/bullseye/Dockerfile b/tip/trixie/Dockerfile similarity index 96% rename from tip/bullseye/Dockerfile rename to tip/trixie/Dockerfile index 809b611b..7bbfba11 100644 --- a/tip/bullseye/Dockerfile +++ b/tip/trixie/Dockerfile @@ -4,11 +4,11 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm AS build +FROM buildpack-deps:trixie-scm AS build ENV PATH /usr/local/go/bin:$PATH -COPY --from=golang:bullseye /usr/local/go /usr/local/goroot-bootstrap +COPY --from=golang:trixie /usr/local/go /usr/local/goroot-bootstrap # tip-20250808: https://github.com/golang/go/tree/fbac94a79998d4730a58592f0634fa8a39d8b9fb ARG GOLANG_COMMIT='fbac94a79998d4730a58592f0634fa8a39d8b9fb' @@ -107,7 +107,7 @@ RUN set -eux; \ [ "$SOURCE_DATE_EPOCH" = "$epoch" ]; \ find /target -newer /target/usr/local/go -exec sh -c 'ls -ld "$@" && exit "$#"' -- '{}' + -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm # install cgo-related dependencies RUN set -eux; \ diff --git a/versions.json b/versions.json index ea853561..5b54241f 100644 --- a/versions.json +++ b/versions.json @@ -392,8 +392,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", @@ -795,8 +795,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", @@ -1207,8 +1207,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", @@ -1313,8 +1313,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21" ] diff --git a/versions.sh b/versions.sh index 5ec94515..fc71233e 100755 --- a/versions.sh +++ b/versions.sh @@ -235,8 +235,8 @@ for version in "${versions[@]}"; do ) ), variants: [ + "trixie", "bookworm", - "bullseye", ( "3.22", "3.21",