diff --git a/3.2/slim-bullseye/Dockerfile b/3.2/slim-trixie/Dockerfile similarity index 99% rename from 3.2/slim-bullseye/Dockerfile rename to 3.2/slim-trixie/Dockerfile index 76afd63c5..350f8cf15 100644 --- a/3.2/slim-bullseye/Dockerfile +++ b/3.2/slim-trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/3.2/bullseye/Dockerfile b/3.2/trixie/Dockerfile similarity index 99% rename from 3.2/bullseye/Dockerfile rename to 3.2/trixie/Dockerfile index b2052355d..a2dc35892 100644 --- a/3.2/bullseye/Dockerfile +++ b/3.2/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.3/slim-bullseye/Dockerfile b/3.3/slim-trixie/Dockerfile similarity index 99% rename from 3.3/slim-bullseye/Dockerfile rename to 3.3/slim-trixie/Dockerfile index e1291c858..f57afb18b 100644 --- a/3.3/slim-bullseye/Dockerfile +++ b/3.3/slim-trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/3.3/bullseye/Dockerfile b/3.3/trixie/Dockerfile similarity index 99% rename from 3.3/bullseye/Dockerfile rename to 3.3/trixie/Dockerfile index bf468ae30..a38cb2129 100644 --- a/3.3/bullseye/Dockerfile +++ b/3.3/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.4/slim-bullseye/Dockerfile b/3.4/slim-trixie/Dockerfile similarity index 99% rename from 3.4/slim-bullseye/Dockerfile rename to 3.4/slim-trixie/Dockerfile index 31cdaaaf2..219c7d7d2 100644 --- a/3.4/slim-bullseye/Dockerfile +++ b/3.4/slim-trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/3.4/bullseye/Dockerfile b/3.4/trixie/Dockerfile similarity index 99% rename from 3.4/bullseye/Dockerfile rename to 3.4/trixie/Dockerfile index e3c7445da..6346214df 100644 --- a/3.4/bullseye/Dockerfile +++ b/3.4/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/3.5-rc/slim-bullseye/Dockerfile b/3.5-rc/slim-trixie/Dockerfile similarity index 99% rename from 3.5-rc/slim-bullseye/Dockerfile rename to 3.5-rc/slim-trixie/Dockerfile index d538daea2..ca2faf3e9 100644 --- a/3.5-rc/slim-bullseye/Dockerfile +++ b/3.5-rc/slim-trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM debian:bullseye-slim +FROM debian:trixie-slim RUN set -eux; \ apt-get update; \ diff --git a/3.5-rc/bullseye/Dockerfile b/3.5-rc/trixie/Dockerfile similarity index 99% rename from 3.5-rc/bullseye/Dockerfile rename to 3.5-rc/trixie/Dockerfile index 2aa035aa9..af6171a05 100644 --- a/3.5-rc/bullseye/Dockerfile +++ b/3.5-rc/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye +FROM buildpack-deps:trixie # skip installing gem documentation with `gem install`/`gem update` RUN set -eux; \ diff --git a/versions.json b/versions.json index b8f8d5de7..e26445542 100644 --- a/versions.json +++ b/versions.json @@ -29,10 +29,10 @@ "zip": "6a313a36d6e630fb795d37f18da1e908d03c05d7200ef86e2260a18b5fc71f8f3201431f255e3cf7a47e0ee25ab5b9158b9477100ad6729e1f7ebf13f9b0a840" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -99,10 +99,10 @@ "zip": "67a6e0bdce21b237d8db62a8351fb544dc8cf15a1afcb111d0589b0384f6b977a3f779042ef49eb170256ac168e0477b8b56f343ab381422e788850c1d171382" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -169,10 +169,10 @@ "xz": "1f5d2fd527d15bd81ca8f49767d6426533367c1018a1d275d34721a96410b51204236173224e5198a42b56162c6e7a7b0c060fc032a9fd7f250b44e05c7af560" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], @@ -246,10 +246,10 @@ "xz": "835bd0b65d546722c83b0ab454256357b48898a0de9aa8e38966f53d2370a6e99552eeaff76a0b680aefbbe7491e701e5e7357797e50f063c53e79d9561c1dac" }, "variants": [ + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "alpine3.22", "alpine3.21" ], diff --git a/versions.sh b/versions.sh index 9bcde726a..3e9a90c91 100755 --- a/versions.sh +++ b/versions.sh @@ -83,8 +83,8 @@ for version in "${versions[@]}"; do doc="$(jq <<<"$doc" -c ' .variants = [ ( + "trixie", "bookworm", - "bullseye", empty # trailing comma hack | ., "slim-" + .), # https://github.com/docker-library/ruby/pull/142#issuecomment-320012893 (