Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update openjdk #17407

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Update openjdk #17407

merged 1 commit into from
Aug 21, 2024

Conversation

yosifkit
Copy link
Member

Changes:

According to the schedule this should be the "Final Release Candidate" for 23: https://openjdk.org/projects/jdk/23/. That means this will likely be the final 23 available in the openjdk tags since we only continue to provide them for pre-releases.

Reminder to use one of the other Official Images for GA releases: https://github.com/docker-library/docs/blob/f80da10a27ea507d6e916d33267c3217b5905d8a/openjdk/README.md#deprecation-notice

@yosifkit yosifkit requested a review from a team as a code owner August 21, 2024 19:06
Copy link

Diff for 98110b6:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1dbbf67..fb07a80 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,12 +3,12 @@ GitRepo: https://github.com/docker-library/openjdk.git
 
 Tags: 23-rc-jdk-bookworm, 23-rc-bookworm, 23-jdk-bookworm, 23-bookworm
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/bookworm
 
 Tags: 23-rc-jdk-bullseye, 23-rc-bullseye, 23-jdk-bullseye, 23-bullseye
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/bullseye
 
 Tags: 23-rc-jdk-nanoserver-1809, 23-rc-nanoserver-1809, 23-jdk-nanoserver-1809, 23-nanoserver-1809
@@ -20,36 +20,36 @@ Constraints: nanoserver-1809, windowsservercore-1809
 
 Tags: 23-rc-jdk-oraclelinux8, 23-rc-oraclelinux8, 23-jdk-oraclelinux8, 23-oraclelinux8
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/oraclelinux8
 
 Tags: 23-rc-jdk-oraclelinux9, 23-rc-oraclelinux9, 23-jdk-oraclelinux9, 23-oraclelinux9, 23-rc-jdk-oracle, 23-rc-oracle, 23-jdk-oracle, 23-oracle
 SharedTags: 23-rc-jdk, 23-rc, 23-jdk, 23
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/oraclelinux9
 
 Tags: 23-rc-jdk-slim-bookworm, 23-rc-slim-bookworm, 23-jdk-slim-bookworm, 23-slim-bookworm, 23-rc-jdk-slim, 23-rc-slim, 23-jdk-slim, 23-slim
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/slim-bookworm
 
 Tags: 23-rc-jdk-slim-bullseye, 23-rc-slim-bullseye, 23-jdk-slim-bullseye, 23-slim-bullseye
 Architectures: amd64, arm64v8
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/slim-bullseye
 
 Tags: 23-rc-jdk-windowsservercore-1809, 23-rc-windowsservercore-1809, 23-jdk-windowsservercore-1809, 23-windowsservercore-1809
 SharedTags: 23-rc-jdk-windowsservercore, 23-rc-windowsservercore, 23-jdk-windowsservercore, 23-windowsservercore, 23-rc-jdk, 23-rc, 23-jdk, 23
 Architectures: windows-amd64
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
 Tags: 23-rc-jdk-windowsservercore-ltsc2022, 23-rc-windowsservercore-ltsc2022, 23-jdk-windowsservercore-ltsc2022, 23-windowsservercore-ltsc2022
 SharedTags: 23-rc-jdk-windowsservercore, 23-rc-windowsservercore, 23-jdk-windowsservercore, 23-windowsservercore, 23-rc-jdk, 23-rc, 23-jdk, 23
 Architectures: windows-amd64
-GitCommit: ef6c71c79148fdbac029ee6924626699ca5cd8c1
+GitCommit: 9561b4fda40bd1525d1c05244474e52778737678
 Directory: 23/jdk/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
 
diff --git a/openjdk_23-bookworm/Dockerfile b/openjdk_23-bookworm/Dockerfile
index 8a6e229..8f630b4 100644
--- a/openjdk_23-bookworm/Dockerfile
+++ b/openjdk_23-bookworm/Dockerfile
@@ -44,12 +44,12 @@ RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-bullseye/Dockerfile b/openjdk_23-bullseye/Dockerfile
index f493d2a..e25ebf6 100644
--- a/openjdk_23-bullseye/Dockerfile
+++ b/openjdk_23-bullseye/Dockerfile
@@ -44,12 +44,12 @@ RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-oracle/Dockerfile b/openjdk_23-oracle/Dockerfile
index e6d2bad..2df8445 100644
--- a/openjdk_23-oracle/Dockerfile
+++ b/openjdk_23-oracle/Dockerfile
@@ -37,12 +37,12 @@ RUN set -eux; \
 	arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
 	case "$arch" in \
 		'x86_64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'aarch64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-oraclelinux8/Dockerfile b/openjdk_23-oraclelinux8/Dockerfile
index e803190..f11596e 100644
--- a/openjdk_23-oraclelinux8/Dockerfile
+++ b/openjdk_23-oraclelinux8/Dockerfile
@@ -37,12 +37,12 @@ RUN set -eux; \
 	arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
 	case "$arch" in \
 		'x86_64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'aarch64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-slim-bullseye/Dockerfile b/openjdk_23-slim-bullseye/Dockerfile
index ed6183b..2f2af45 100644
--- a/openjdk_23-slim-bullseye/Dockerfile
+++ b/openjdk_23-slim-bullseye/Dockerfile
@@ -31,12 +31,12 @@ RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-slim/Dockerfile b/openjdk_23-slim/Dockerfile
index 6ef7efa..d0557f3 100644
--- a/openjdk_23-slim/Dockerfile
+++ b/openjdk_23-slim/Dockerfile
@@ -31,12 +31,12 @@ RUN set -eux; \
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
-			downloadSha256='d8d169ae7a0285e09872565bc3044ad97697d3780e678d2a5ae9f8451c207cfc'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz'; \
+			downloadSha256='08fea92724127c6fa0f2e5ea0b07ff4951ccb1e2f22db3c21eebbd7347152a67'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='5cad336e22d64a4a578f59d089223c226d67455c410cbaeb91f5fa0503ce2f96'; \
+			downloadUrl='https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='076dcf7078cdf941951587bf92733abacf489a6570f1df97ee35945ffebec5b7'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_23-windowsservercore-1809/Dockerfile b/openjdk_23-windowsservercore-1809/Dockerfile
index 28e03b8..42a3cda 100644
--- a/openjdk_23-windowsservercore-1809/Dockerfile
+++ b/openjdk_23-windowsservercore-1809/Dockerfile
@@ -34,8 +34,8 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 # > Java Development Kit builds, from Oracle
 # >
 ENV JAVA_VERSION 23
-ENV JAVA_URL https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_windows-x64_bin.zip
-ENV JAVA_SHA256 b18897bec6b1c6e0f639d95757eb0e3b0ec3d69720f6e4631874f2f9408075c5
+ENV JAVA_URL https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_windows-x64_bin.zip
+ENV JAVA_SHA256 cba5013874ba50cae543c86fe6423453816c77281e2751a8a9a633d966f1dc04
 
 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/openjdk_23-windowsservercore-ltsc2022/Dockerfile b/openjdk_23-windowsservercore-ltsc2022/Dockerfile
index 9b4b183..5acb792 100644
--- a/openjdk_23-windowsservercore-ltsc2022/Dockerfile
+++ b/openjdk_23-windowsservercore-ltsc2022/Dockerfile
@@ -34,8 +34,8 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 # > Java Development Kit builds, from Oracle
 # >
 ENV JAVA_VERSION 23
-ENV JAVA_URL https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/36/GPL/openjdk-23_windows-x64_bin.zip
-ENV JAVA_SHA256 b18897bec6b1c6e0f639d95757eb0e3b0ec3d69720f6e4631874f2f9408075c5
+ENV JAVA_URL https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_windows-x64_bin.zip
+ENV JAVA_SHA256 cba5013874ba50cae543c86fe6423453816c77281e2751a8a9a633d966f1dc04
 
 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

Relevant Maintainers:

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's the final countdown!

@tianon tianon merged commit f991ab8 into docker-library:master Aug 21, 2024
21 checks passed
@tianon tianon deleted the openjdk branch August 21, 2024 20:12
@whalelines
Copy link
Contributor

gob-final-countdown

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.

4 participants