From 25081b47fd632d8a7140a3fede2da1db2d96aee5 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Aug 2025 10:33:54 -0700 Subject: [PATCH] Add Debian Trixie (remove Bullseye) --- 1.10/{bullseye => trixie}/Dockerfile | 2 +- 1.10/{bullseye => trixie}/docker-entrypoint.sh | 0 1.11/{bullseye => trixie}/Dockerfile | 2 +- 1.11/{bullseye => trixie}/docker-entrypoint.sh | 0 1.12-rc/{bullseye => trixie}/Dockerfile | 2 +- 1.12-rc/{bullseye => trixie}/docker-entrypoint.sh | 0 versions.json | 6 +++--- versions.sh | 2 +- 8 files changed, 7 insertions(+), 7 deletions(-) rename 1.10/{bullseye => trixie}/Dockerfile (99%) rename 1.10/{bullseye => trixie}/docker-entrypoint.sh (100%) rename 1.11/{bullseye => trixie}/Dockerfile (99%) rename 1.11/{bullseye => trixie}/docker-entrypoint.sh (100%) rename 1.12-rc/{bullseye => trixie}/Dockerfile (98%) rename 1.12-rc/{bullseye => trixie}/docker-entrypoint.sh (100%) diff --git a/1.10/bullseye/Dockerfile b/1.10/trixie/Dockerfile similarity index 99% rename from 1.10/bullseye/Dockerfile rename to 1.10/trixie/Dockerfile index db278fad..39db49e7 100644 --- a/1.10/bullseye/Dockerfile +++ b/1.10/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/1.10/bullseye/docker-entrypoint.sh b/1.10/trixie/docker-entrypoint.sh similarity index 100% rename from 1.10/bullseye/docker-entrypoint.sh rename to 1.10/trixie/docker-entrypoint.sh diff --git a/1.11/bullseye/Dockerfile b/1.11/trixie/Dockerfile similarity index 99% rename from 1.11/bullseye/Dockerfile rename to 1.11/trixie/Dockerfile index 881d0c5d..7c94b101 100644 --- a/1.11/bullseye/Dockerfile +++ b/1.11/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/1.11/bullseye/docker-entrypoint.sh b/1.11/trixie/docker-entrypoint.sh similarity index 100% rename from 1.11/bullseye/docker-entrypoint.sh rename to 1.11/trixie/docker-entrypoint.sh diff --git a/1.12-rc/bullseye/Dockerfile b/1.12-rc/trixie/Dockerfile similarity index 98% rename from 1.12-rc/bullseye/Dockerfile rename to 1.12-rc/trixie/Dockerfile index f0159cec..d1839a07 100644 --- a/1.12-rc/bullseye/Dockerfile +++ b/1.12-rc/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/1.12-rc/bullseye/docker-entrypoint.sh b/1.12-rc/trixie/docker-entrypoint.sh similarity index 100% rename from 1.12-rc/bullseye/docker-entrypoint.sh rename to 1.12-rc/trixie/docker-entrypoint.sh diff --git a/versions.json b/versions.json index 241e2219..cf2e6248 100644 --- a/versions.json +++ b/versions.json @@ -43,8 +43,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", @@ -96,8 +96,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", @@ -146,8 +146,8 @@ } }, "variants": [ + "trixie", "bookworm", - "bullseye", "alpine3.22", "alpine3.21", "windows/windowsservercore-ltsc2025", diff --git a/versions.sh b/versions.sh index 22154b6f..670574e3 100755 --- a/versions.sh +++ b/versions.sh @@ -101,8 +101,8 @@ for version in "${versions[@]}"; do $doc | del(.major) | .variants = ([ + "trixie", "bookworm", - "bullseye", if .arches | keys | any(startswith("alpine-")) then "3.22", "3.21",