From 86c7c6acd1992af73b7a6dfdc06719d32ba32bf0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Aug 2025 10:36:38 -0700 Subject: [PATCH] Add Debian Trixie (remove Bullseye) --- 25/jdk/{slim-bullseye => slim-trixie}/Dockerfile | 2 +- 25/jdk/{bullseye => trixie}/Dockerfile | 2 +- 26/jdk/{slim-bullseye => slim-trixie}/Dockerfile | 2 +- 26/jdk/{bullseye => trixie}/Dockerfile | 2 +- versions.json | 8 ++++---- versions.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename 25/jdk/{slim-bullseye => slim-trixie}/Dockerfile (99%) rename 25/jdk/{bullseye => trixie}/Dockerfile (99%) rename 26/jdk/{slim-bullseye => slim-trixie}/Dockerfile (99%) rename 26/jdk/{bullseye => trixie}/Dockerfile (99%) diff --git a/25/jdk/slim-bullseye/Dockerfile b/25/jdk/slim-trixie/Dockerfile similarity index 99% rename from 25/jdk/slim-bullseye/Dockerfile rename to 25/jdk/slim-trixie/Dockerfile index 81f06201..df4318ac 100644 --- a/25/jdk/slim-bullseye/Dockerfile +++ b/25/jdk/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/25/jdk/bullseye/Dockerfile b/25/jdk/trixie/Dockerfile similarity index 99% rename from 25/jdk/bullseye/Dockerfile rename to 25/jdk/trixie/Dockerfile index 07b1c270..ec45af2c 100644 --- a/25/jdk/bullseye/Dockerfile +++ b/25/jdk/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm RUN set -eux; \ apt-get update; \ diff --git a/26/jdk/slim-bullseye/Dockerfile b/26/jdk/slim-trixie/Dockerfile similarity index 99% rename from 26/jdk/slim-bullseye/Dockerfile rename to 26/jdk/slim-trixie/Dockerfile index 99a2af92..f78581d0 100644 --- a/26/jdk/slim-bullseye/Dockerfile +++ b/26/jdk/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/26/jdk/bullseye/Dockerfile b/26/jdk/trixie/Dockerfile similarity index 99% rename from 26/jdk/bullseye/Dockerfile rename to 26/jdk/trixie/Dockerfile index 667d9347..bbd9b9d4 100644 --- a/26/jdk/bullseye/Dockerfile +++ b/26/jdk/trixie/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM buildpack-deps:bullseye-scm +FROM buildpack-deps:trixie-scm RUN set -eux; \ apt-get update; \ diff --git a/versions.json b/versions.json index 94dedcee..5d5cac13 100644 --- a/versions.json +++ b/versions.json @@ -19,10 +19,10 @@ "variants": [ "oraclelinux9", "oraclelinux8", + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/nanoserver-ltsc2025", @@ -50,10 +50,10 @@ "variants": [ "oraclelinux9", "oraclelinux8", + "trixie", + "slim-trixie", "bookworm", "slim-bookworm", - "bullseye", - "slim-bullseye", "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022", "windows/nanoserver-ltsc2025", diff --git a/versions.sh b/versions.sh index 9f9d1860..bde694c0 100755 --- a/versions.sh +++ b/versions.sh @@ -155,8 +155,8 @@ for version in "${versions[@]}"; do empty | "oraclelinux" + .), ( + "trixie", "bookworm", - "bullseye", empty | ., "slim-" + .), if $doc.alpine then