Skip to content

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 12, 2025

Changes:

Changes:

- docker-library/openjdk@3d1a899: Merge pull request docker-library/openjdk#549 from infosiftr/trixie
- docker-library/openjdk@9fa18d4: Add Debian Trixie (remove Bullseye)
@tianon tianon requested a review from a team as a code owner August 12, 2025 22:08
Copy link

Diff for a43a56d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0ca71fe..a38a444 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,11 +6,6 @@ Architectures: amd64, arm64v8
 GitCommit: 0ef4c9faaa4fc9072be73522f4bbd5298a098505
 Directory: 25/jdk/bookworm
 
-Tags: 25-rc-jdk-bullseye, 25-rc-bullseye, 25-jdk-bullseye, 25-bullseye
-Architectures: amd64, arm64v8
-GitCommit: 0ef4c9faaa4fc9072be73522f4bbd5298a098505
-Directory: 25/jdk/bullseye
-
 Tags: 25-rc-jdk-nanoserver-ltsc2022, 25-rc-nanoserver-ltsc2022, 25-jdk-nanoserver-ltsc2022, 25-nanoserver-ltsc2022
 SharedTags: 25-rc-jdk-nanoserver, 25-rc-nanoserver, 25-jdk-nanoserver, 25-nanoserver
 Architectures: windows-amd64
@@ -36,15 +31,20 @@ Architectures: amd64, arm64v8
 GitCommit: 0ef4c9faaa4fc9072be73522f4bbd5298a098505
 Directory: 25/jdk/oraclelinux9
 
-Tags: 25-rc-jdk-slim-bookworm, 25-rc-slim-bookworm, 25-jdk-slim-bookworm, 25-slim-bookworm, 25-rc-jdk-slim, 25-rc-slim, 25-jdk-slim, 25-slim
+Tags: 25-rc-jdk-slim-bookworm, 25-rc-slim-bookworm, 25-jdk-slim-bookworm, 25-slim-bookworm
 Architectures: amd64, arm64v8
 GitCommit: 0ef4c9faaa4fc9072be73522f4bbd5298a098505
 Directory: 25/jdk/slim-bookworm
 
-Tags: 25-rc-jdk-slim-bullseye, 25-rc-slim-bullseye, 25-jdk-slim-bullseye, 25-slim-bullseye
+Tags: 25-rc-jdk-slim-trixie, 25-rc-slim-trixie, 25-jdk-slim-trixie, 25-slim-trixie, 25-rc-jdk-slim, 25-rc-slim, 25-jdk-slim, 25-slim
 Architectures: amd64, arm64v8
-GitCommit: 0ef4c9faaa4fc9072be73522f4bbd5298a098505
-Directory: 25/jdk/slim-bullseye
+GitCommit: 9fa18d4c199ab09c81ea596289a02fdcf0e684b1
+Directory: 25/jdk/slim-trixie
+
+Tags: 25-rc-jdk-trixie, 25-rc-trixie, 25-jdk-trixie, 25-trixie
+Architectures: amd64, arm64v8
+GitCommit: 9fa18d4c199ab09c81ea596289a02fdcf0e684b1
+Directory: 25/jdk/trixie
 
 Tags: 25-rc-jdk-windowsservercore-ltsc2022, 25-rc-windowsservercore-ltsc2022, 25-jdk-windowsservercore-ltsc2022, 25-windowsservercore-ltsc2022
 SharedTags: 25-rc-jdk-windowsservercore, 25-rc-windowsservercore, 25-jdk-windowsservercore, 25-windowsservercore, 25-rc-jdk, 25-rc, 25-jdk, 25
@@ -65,11 +65,6 @@ Architectures: amd64, arm64v8
 GitCommit: e6ea4775388030187e24406f191f932fb707f7bd
 Directory: 26/jdk/bookworm
 
-Tags: 26-ea-10-jdk-bullseye, 26-ea-10-bullseye, 26-ea-jdk-bullseye, 26-ea-bullseye, 26-jdk-bullseye, 26-bullseye
-Architectures: amd64, arm64v8
-GitCommit: e6ea4775388030187e24406f191f932fb707f7bd
-Directory: 26/jdk/bullseye
-
 Tags: 26-ea-10-jdk-nanoserver-ltsc2022, 26-ea-10-nanoserver-ltsc2022, 26-ea-jdk-nanoserver-ltsc2022, 26-ea-nanoserver-ltsc2022, 26-jdk-nanoserver-ltsc2022, 26-nanoserver-ltsc2022
 SharedTags: 26-ea-10-jdk-nanoserver, 26-ea-10-nanoserver, 26-ea-jdk-nanoserver, 26-ea-nanoserver, 26-jdk-nanoserver, 26-nanoserver
 Architectures: windows-amd64
@@ -95,15 +90,20 @@ Architectures: amd64, arm64v8
 GitCommit: e6ea4775388030187e24406f191f932fb707f7bd
 Directory: 26/jdk/oraclelinux9
 
-Tags: 26-ea-10-jdk-slim-bookworm, 26-ea-10-slim-bookworm, 26-ea-jdk-slim-bookworm, 26-ea-slim-bookworm, 26-jdk-slim-bookworm, 26-slim-bookworm, 26-ea-10-jdk-slim, 26-ea-10-slim, 26-ea-jdk-slim, 26-ea-slim, 26-jdk-slim, 26-slim
+Tags: 26-ea-10-jdk-slim-bookworm, 26-ea-10-slim-bookworm, 26-ea-jdk-slim-bookworm, 26-ea-slim-bookworm, 26-jdk-slim-bookworm, 26-slim-bookworm
 Architectures: amd64, arm64v8
 GitCommit: e6ea4775388030187e24406f191f932fb707f7bd
 Directory: 26/jdk/slim-bookworm
 
-Tags: 26-ea-10-jdk-slim-bullseye, 26-ea-10-slim-bullseye, 26-ea-jdk-slim-bullseye, 26-ea-slim-bullseye, 26-jdk-slim-bullseye, 26-slim-bullseye
+Tags: 26-ea-10-jdk-slim-trixie, 26-ea-10-slim-trixie, 26-ea-jdk-slim-trixie, 26-ea-slim-trixie, 26-jdk-slim-trixie, 26-slim-trixie, 26-ea-10-jdk-slim, 26-ea-10-slim, 26-ea-jdk-slim, 26-ea-slim, 26-jdk-slim, 26-slim
 Architectures: amd64, arm64v8
-GitCommit: e6ea4775388030187e24406f191f932fb707f7bd
-Directory: 26/jdk/slim-bullseye
+GitCommit: 9fa18d4c199ab09c81ea596289a02fdcf0e684b1
+Directory: 26/jdk/slim-trixie
+
+Tags: 26-ea-10-jdk-trixie, 26-ea-10-trixie, 26-ea-jdk-trixie, 26-ea-trixie, 26-jdk-trixie, 26-trixie
+Architectures: amd64, arm64v8
+GitCommit: 9fa18d4c199ab09c81ea596289a02fdcf0e684b1
+Directory: 26/jdk/trixie
 
 Tags: 26-ea-10-jdk-windowsservercore-ltsc2022, 26-ea-10-windowsservercore-ltsc2022, 26-ea-jdk-windowsservercore-ltsc2022, 26-ea-windowsservercore-ltsc2022, 26-jdk-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022
 SharedTags: 26-ea-10-jdk-windowsservercore, 26-ea-10-windowsservercore, 26-ea-jdk-windowsservercore, 26-ea-windowsservercore, 26-jdk-windowsservercore, 26-windowsservercore, 26-ea-10-jdk, 26-ea-10, 26-ea-jdk, 26-ea, 26-jdk, 26
diff --git a/_bashbrew-list b/_bashbrew-list
index 72c7d5d..9147408 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,7 @@
 openjdk:25
 openjdk:25-bookworm
-openjdk:25-bullseye
 openjdk:25-jdk
 openjdk:25-jdk-bookworm
-openjdk:25-jdk-bullseye
 openjdk:25-jdk-nanoserver
 openjdk:25-jdk-nanoserver-ltsc2022
 openjdk:25-jdk-nanoserver-ltsc2025
@@ -12,7 +10,8 @@ openjdk:25-jdk-oraclelinux8
 openjdk:25-jdk-oraclelinux9
 openjdk:25-jdk-slim
 openjdk:25-jdk-slim-bookworm
-openjdk:25-jdk-slim-bullseye
+openjdk:25-jdk-slim-trixie
+openjdk:25-jdk-trixie
 openjdk:25-jdk-windowsservercore
 openjdk:25-jdk-windowsservercore-ltsc2022
 openjdk:25-jdk-windowsservercore-ltsc2025
@@ -24,10 +23,8 @@ openjdk:25-oraclelinux8
 openjdk:25-oraclelinux9
 openjdk:25-rc
 openjdk:25-rc-bookworm
-openjdk:25-rc-bullseye
 openjdk:25-rc-jdk
 openjdk:25-rc-jdk-bookworm
-openjdk:25-rc-jdk-bullseye
 openjdk:25-rc-jdk-nanoserver
 openjdk:25-rc-jdk-nanoserver-ltsc2022
 openjdk:25-rc-jdk-nanoserver-ltsc2025
@@ -36,7 +33,8 @@ openjdk:25-rc-jdk-oraclelinux8
 openjdk:25-rc-jdk-oraclelinux9
 openjdk:25-rc-jdk-slim
 openjdk:25-rc-jdk-slim-bookworm
-openjdk:25-rc-jdk-slim-bullseye
+openjdk:25-rc-jdk-slim-trixie
+openjdk:25-rc-jdk-trixie
 openjdk:25-rc-jdk-windowsservercore
 openjdk:25-rc-jdk-windowsservercore-ltsc2022
 openjdk:25-rc-jdk-windowsservercore-ltsc2025
@@ -48,26 +46,25 @@ openjdk:25-rc-oraclelinux8
 openjdk:25-rc-oraclelinux9
 openjdk:25-rc-slim
 openjdk:25-rc-slim-bookworm
-openjdk:25-rc-slim-bullseye
+openjdk:25-rc-slim-trixie
+openjdk:25-rc-trixie
 openjdk:25-rc-windowsservercore
 openjdk:25-rc-windowsservercore-ltsc2022
 openjdk:25-rc-windowsservercore-ltsc2025
 openjdk:25-slim
 openjdk:25-slim-bookworm
-openjdk:25-slim-bullseye
+openjdk:25-slim-trixie
+openjdk:25-trixie
 openjdk:25-windowsservercore
 openjdk:25-windowsservercore-ltsc2022
 openjdk:25-windowsservercore-ltsc2025
 openjdk:26
 openjdk:26-bookworm
-openjdk:26-bullseye
 openjdk:26-ea
 openjdk:26-ea-10
 openjdk:26-ea-10-bookworm
-openjdk:26-ea-10-bullseye
 openjdk:26-ea-10-jdk
 openjdk:26-ea-10-jdk-bookworm
-openjdk:26-ea-10-jdk-bullseye
 openjdk:26-ea-10-jdk-nanoserver
 openjdk:26-ea-10-jdk-nanoserver-ltsc2022
 openjdk:26-ea-10-jdk-nanoserver-ltsc2025
@@ -76,7 +73,8 @@ openjdk:26-ea-10-jdk-oraclelinux8
 openjdk:26-ea-10-jdk-oraclelinux9
 openjdk:26-ea-10-jdk-slim
 openjdk:26-ea-10-jdk-slim-bookworm
-openjdk:26-ea-10-jdk-slim-bullseye
+openjdk:26-ea-10-jdk-slim-trixie
+openjdk:26-ea-10-jdk-trixie
 openjdk:26-ea-10-jdk-windowsservercore
 openjdk:26-ea-10-jdk-windowsservercore-ltsc2022
 openjdk:26-ea-10-jdk-windowsservercore-ltsc2025
@@ -88,15 +86,14 @@ openjdk:26-ea-10-oraclelinux8
 openjdk:26-ea-10-oraclelinux9
 openjdk:26-ea-10-slim
 openjdk:26-ea-10-slim-bookworm
-openjdk:26-ea-10-slim-bullseye
+openjdk:26-ea-10-slim-trixie
+openjdk:26-ea-10-trixie
 openjdk:26-ea-10-windowsservercore
 openjdk:26-ea-10-windowsservercore-ltsc2022
 openjdk:26-ea-10-windowsservercore-ltsc2025
 openjdk:26-ea-bookworm
-openjdk:26-ea-bullseye
 openjdk:26-ea-jdk
 openjdk:26-ea-jdk-bookworm
-openjdk:26-ea-jdk-bullseye
 openjdk:26-ea-jdk-nanoserver
 openjdk:26-ea-jdk-nanoserver-ltsc2022
 openjdk:26-ea-jdk-nanoserver-ltsc2025
@@ -105,7 +102,8 @@ openjdk:26-ea-jdk-oraclelinux8
 openjdk:26-ea-jdk-oraclelinux9
 openjdk:26-ea-jdk-slim
 openjdk:26-ea-jdk-slim-bookworm
-openjdk:26-ea-jdk-slim-bullseye
+openjdk:26-ea-jdk-slim-trixie
+openjdk:26-ea-jdk-trixie
 openjdk:26-ea-jdk-windowsservercore
 openjdk:26-ea-jdk-windowsservercore-ltsc2022
 openjdk:26-ea-jdk-windowsservercore-ltsc2025
@@ -117,13 +115,13 @@ openjdk:26-ea-oraclelinux8
 openjdk:26-ea-oraclelinux9
 openjdk:26-ea-slim
 openjdk:26-ea-slim-bookworm
-openjdk:26-ea-slim-bullseye
+openjdk:26-ea-slim-trixie
+openjdk:26-ea-trixie
 openjdk:26-ea-windowsservercore
 openjdk:26-ea-windowsservercore-ltsc2022
 openjdk:26-ea-windowsservercore-ltsc2025
 openjdk:26-jdk
 openjdk:26-jdk-bookworm
-openjdk:26-jdk-bullseye
 openjdk:26-jdk-nanoserver
 openjdk:26-jdk-nanoserver-ltsc2022
 openjdk:26-jdk-nanoserver-ltsc2025
@@ -132,7 +130,8 @@ openjdk:26-jdk-oraclelinux8
 openjdk:26-jdk-oraclelinux9
 openjdk:26-jdk-slim
 openjdk:26-jdk-slim-bookworm
-openjdk:26-jdk-slim-bullseye
+openjdk:26-jdk-slim-trixie
+openjdk:26-jdk-trixie
 openjdk:26-jdk-windowsservercore
 openjdk:26-jdk-windowsservercore-ltsc2022
 openjdk:26-jdk-windowsservercore-ltsc2025
@@ -144,7 +143,8 @@ openjdk:26-oraclelinux8
 openjdk:26-oraclelinux9
 openjdk:26-slim
 openjdk:26-slim-bookworm
-openjdk:26-slim-bullseye
+openjdk:26-slim-trixie
+openjdk:26-trixie
 openjdk:26-windowsservercore
 openjdk:26-windowsservercore-ltsc2022
 openjdk:26-windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index a347b26..45d3603 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,17 +1,17 @@
 openjdk:25-bookworm
-openjdk:25-bullseye
 openjdk:25-oracle
 openjdk:25-oraclelinux8
 openjdk:25-slim
-openjdk:25-slim-bullseye
+openjdk:25-slim-bookworm
+openjdk:25-trixie
 openjdk:25-windowsservercore-ltsc2022
 openjdk:25-windowsservercore-ltsc2025
 openjdk:26-bookworm
-openjdk:26-bullseye
 openjdk:26-oracle
 openjdk:26-oraclelinux8
 openjdk:26-slim
-openjdk:26-slim-bullseye
+openjdk:26-slim-bookworm
+openjdk:26-trixie
 openjdk:26-windowsservercore-ltsc2022
 openjdk:26-windowsservercore-ltsc2025
 openjdk:25-nanoserver-ltsc2022
diff --git a/openjdk_25-slim/Dockerfile b/openjdk_25-slim-bookworm/Dockerfile
similarity index 100%
copy from openjdk_25-slim/Dockerfile
copy to openjdk_25-slim-bookworm/Dockerfile
diff --git a/openjdk_25-slim-bullseye/Dockerfile b/openjdk_25-slim-bullseye/Dockerfile
deleted file mode 100644
index 17690dd..0000000
diff --git a/openjdk_25-slim/Dockerfile b/openjdk_25-slim/Dockerfile
index 251ebf2..fefdfe8 100644
--- a/openjdk_25-slim/Dockerfile
+++ b/openjdk_25-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/openjdk_25-bullseye/Dockerfile b/openjdk_25-trixie/Dockerfile
similarity index 99%
rename from openjdk_25-bullseye/Dockerfile
rename to openjdk_25-trixie/Dockerfile
index de25cd4..e23640b 100644
--- a/openjdk_25-bullseye/Dockerfile
+++ b/openjdk_25-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/openjdk_26-slim/Dockerfile b/openjdk_26-slim-bookworm/Dockerfile
similarity index 100%
copy from openjdk_26-slim/Dockerfile
copy to openjdk_26-slim-bookworm/Dockerfile
diff --git a/openjdk_26-slim-bullseye/Dockerfile b/openjdk_26-slim-bullseye/Dockerfile
deleted file mode 100644
index e41ba36..0000000
diff --git a/openjdk_26-slim/Dockerfile b/openjdk_26-slim/Dockerfile
index be1fe58..7c71dbb 100644
--- a/openjdk_26-slim/Dockerfile
+++ b/openjdk_26-slim/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/openjdk_26-bullseye/Dockerfile b/openjdk_26-trixie/Dockerfile
similarity index 99%
rename from openjdk_26-bullseye/Dockerfile
rename to openjdk_26-trixie/Dockerfile
index 8733855..5351b37 100644
--- a/openjdk_26-bullseye/Dockerfile
+++ b/openjdk_26-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; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 9236948 into docker-library:master Aug 12, 2025
21 checks passed
@yosifkit yosifkit deleted the openjdk branch August 12, 2025 23:29
Muscraft pushed a commit to Muscraft/official-images that referenced this pull request Aug 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants