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 #17683

Merged
merged 1 commit into from
Oct 7, 2024
Merged

Update openjdk #17683

merged 1 commit into from
Oct 7, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 7, 2024

Changes:

Changes:

- docker-library/openjdk@6a15ad9: Update 24 to 24-ea+18
- docker-library/openjdk@3d37b6b: Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates
@tianon tianon requested a review from a team as a code owner October 7, 2024 21:27
Copy link

github-actions bot commented Oct 7, 2024

Diff for 81f0bc6:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index cb61b98..d4bc1ee 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,54 +1,54 @@
 Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson <[email protected]> (@yosifkit)
 GitRepo: https://github.com/docker-library/openjdk.git
 
-Tags: 24-ea-17-jdk-bookworm, 24-ea-17-bookworm, 24-ea-jdk-bookworm, 24-ea-bookworm, 24-jdk-bookworm, 24-bookworm
+Tags: 24-ea-18-jdk-bookworm, 24-ea-18-bookworm, 24-ea-jdk-bookworm, 24-ea-bookworm, 24-jdk-bookworm, 24-bookworm
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/bookworm
 
-Tags: 24-ea-17-jdk-bullseye, 24-ea-17-bullseye, 24-ea-jdk-bullseye, 24-ea-bullseye, 24-jdk-bullseye, 24-bullseye
+Tags: 24-ea-18-jdk-bullseye, 24-ea-18-bullseye, 24-ea-jdk-bullseye, 24-ea-bullseye, 24-jdk-bullseye, 24-bullseye
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/bullseye
 
-Tags: 24-ea-17-jdk-nanoserver-1809, 24-ea-17-nanoserver-1809, 24-ea-jdk-nanoserver-1809, 24-ea-nanoserver-1809, 24-jdk-nanoserver-1809, 24-nanoserver-1809
-SharedTags: 24-ea-17-jdk-nanoserver, 24-ea-17-nanoserver, 24-ea-jdk-nanoserver, 24-ea-nanoserver, 24-jdk-nanoserver, 24-nanoserver
+Tags: 24-ea-18-jdk-nanoserver-1809, 24-ea-18-nanoserver-1809, 24-ea-jdk-nanoserver-1809, 24-ea-nanoserver-1809, 24-jdk-nanoserver-1809, 24-nanoserver-1809
+SharedTags: 24-ea-18-jdk-nanoserver, 24-ea-18-nanoserver, 24-ea-jdk-nanoserver, 24-ea-nanoserver, 24-jdk-nanoserver, 24-nanoserver
 Architectures: windows-amd64
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/windows/nanoserver-1809
 Constraints: nanoserver-1809, windowsservercore-1809
 
-Tags: 24-ea-17-jdk-oraclelinux8, 24-ea-17-oraclelinux8, 24-ea-jdk-oraclelinux8, 24-ea-oraclelinux8, 24-jdk-oraclelinux8, 24-oraclelinux8
+Tags: 24-ea-18-jdk-oraclelinux8, 24-ea-18-oraclelinux8, 24-ea-jdk-oraclelinux8, 24-ea-oraclelinux8, 24-jdk-oraclelinux8, 24-oraclelinux8
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/oraclelinux8
 
-Tags: 24-ea-17-jdk-oraclelinux9, 24-ea-17-oraclelinux9, 24-ea-jdk-oraclelinux9, 24-ea-oraclelinux9, 24-jdk-oraclelinux9, 24-oraclelinux9, 24-ea-17-jdk-oracle, 24-ea-17-oracle, 24-ea-jdk-oracle, 24-ea-oracle, 24-jdk-oracle, 24-oracle
-SharedTags: 24-ea-17-jdk, 24-ea-17, 24-ea-jdk, 24-ea, 24-jdk, 24
+Tags: 24-ea-18-jdk-oraclelinux9, 24-ea-18-oraclelinux9, 24-ea-jdk-oraclelinux9, 24-ea-oraclelinux9, 24-jdk-oraclelinux9, 24-oraclelinux9, 24-ea-18-jdk-oracle, 24-ea-18-oracle, 24-ea-jdk-oracle, 24-ea-oracle, 24-jdk-oracle, 24-oracle
+SharedTags: 24-ea-18-jdk, 24-ea-18, 24-ea-jdk, 24-ea, 24-jdk, 24
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/oraclelinux9
 
-Tags: 24-ea-17-jdk-slim-bookworm, 24-ea-17-slim-bookworm, 24-ea-jdk-slim-bookworm, 24-ea-slim-bookworm, 24-jdk-slim-bookworm, 24-slim-bookworm, 24-ea-17-jdk-slim, 24-ea-17-slim, 24-ea-jdk-slim, 24-ea-slim, 24-jdk-slim, 24-slim
+Tags: 24-ea-18-jdk-slim-bookworm, 24-ea-18-slim-bookworm, 24-ea-jdk-slim-bookworm, 24-ea-slim-bookworm, 24-jdk-slim-bookworm, 24-slim-bookworm, 24-ea-18-jdk-slim, 24-ea-18-slim, 24-ea-jdk-slim, 24-ea-slim, 24-jdk-slim, 24-slim
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/slim-bookworm
 
-Tags: 24-ea-17-jdk-slim-bullseye, 24-ea-17-slim-bullseye, 24-ea-jdk-slim-bullseye, 24-ea-slim-bullseye, 24-jdk-slim-bullseye, 24-slim-bullseye
+Tags: 24-ea-18-jdk-slim-bullseye, 24-ea-18-slim-bullseye, 24-ea-jdk-slim-bullseye, 24-ea-slim-bullseye, 24-jdk-slim-bullseye, 24-slim-bullseye
 Architectures: amd64, arm64v8
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/slim-bullseye
 
-Tags: 24-ea-17-jdk-windowsservercore-1809, 24-ea-17-windowsservercore-1809, 24-ea-jdk-windowsservercore-1809, 24-ea-windowsservercore-1809, 24-jdk-windowsservercore-1809, 24-windowsservercore-1809
-SharedTags: 24-ea-17-jdk-windowsservercore, 24-ea-17-windowsservercore, 24-ea-jdk-windowsservercore, 24-ea-windowsservercore, 24-jdk-windowsservercore, 24-windowsservercore, 24-ea-17-jdk, 24-ea-17, 24-ea-jdk, 24-ea, 24-jdk, 24
+Tags: 24-ea-18-jdk-windowsservercore-1809, 24-ea-18-windowsservercore-1809, 24-ea-jdk-windowsservercore-1809, 24-ea-windowsservercore-1809, 24-jdk-windowsservercore-1809, 24-windowsservercore-1809
+SharedTags: 24-ea-18-jdk-windowsservercore, 24-ea-18-windowsservercore, 24-ea-jdk-windowsservercore, 24-ea-windowsservercore, 24-jdk-windowsservercore, 24-windowsservercore, 24-ea-18-jdk, 24-ea-18, 24-ea-jdk, 24-ea, 24-jdk, 24
 Architectures: windows-amd64
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/windows/windowsservercore-1809
 Constraints: windowsservercore-1809
 
-Tags: 24-ea-17-jdk-windowsservercore-ltsc2022, 24-ea-17-windowsservercore-ltsc2022, 24-ea-jdk-windowsservercore-ltsc2022, 24-ea-windowsservercore-ltsc2022, 24-jdk-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022
-SharedTags: 24-ea-17-jdk-windowsservercore, 24-ea-17-windowsservercore, 24-ea-jdk-windowsservercore, 24-ea-windowsservercore, 24-jdk-windowsservercore, 24-windowsservercore, 24-ea-17-jdk, 24-ea-17, 24-ea-jdk, 24-ea, 24-jdk, 24
+Tags: 24-ea-18-jdk-windowsservercore-ltsc2022, 24-ea-18-windowsservercore-ltsc2022, 24-ea-jdk-windowsservercore-ltsc2022, 24-ea-windowsservercore-ltsc2022, 24-jdk-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022
+SharedTags: 24-ea-18-jdk-windowsservercore, 24-ea-18-windowsservercore, 24-ea-jdk-windowsservercore, 24-ea-windowsservercore, 24-jdk-windowsservercore, 24-windowsservercore, 24-ea-18-jdk, 24-ea-18, 24-ea-jdk, 24-ea, 24-jdk, 24
 Architectures: windows-amd64
-GitCommit: e8eda6b7eb749f71463b1360405472e9dbbf6755
+GitCommit: 6a15ad904559ef795b2b5156f355d07dac259e8a
 Directory: 24/jdk/windows/windowsservercore-ltsc2022
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 1218e6a..8bade33 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,34 +2,34 @@ openjdk:24
 openjdk:24-bookworm
 openjdk:24-bullseye
 openjdk:24-ea
-openjdk:24-ea-17
-openjdk:24-ea-17-bookworm
-openjdk:24-ea-17-bullseye
-openjdk:24-ea-17-jdk
-openjdk:24-ea-17-jdk-bookworm
-openjdk:24-ea-17-jdk-bullseye
-openjdk:24-ea-17-jdk-nanoserver
-openjdk:24-ea-17-jdk-nanoserver-1809
-openjdk:24-ea-17-jdk-oracle
-openjdk:24-ea-17-jdk-oraclelinux8
-openjdk:24-ea-17-jdk-oraclelinux9
-openjdk:24-ea-17-jdk-slim
-openjdk:24-ea-17-jdk-slim-bookworm
-openjdk:24-ea-17-jdk-slim-bullseye
-openjdk:24-ea-17-jdk-windowsservercore
-openjdk:24-ea-17-jdk-windowsservercore-1809
-openjdk:24-ea-17-jdk-windowsservercore-ltsc2022
-openjdk:24-ea-17-nanoserver
-openjdk:24-ea-17-nanoserver-1809
-openjdk:24-ea-17-oracle
-openjdk:24-ea-17-oraclelinux8
-openjdk:24-ea-17-oraclelinux9
-openjdk:24-ea-17-slim
-openjdk:24-ea-17-slim-bookworm
-openjdk:24-ea-17-slim-bullseye
-openjdk:24-ea-17-windowsservercore
-openjdk:24-ea-17-windowsservercore-1809
-openjdk:24-ea-17-windowsservercore-ltsc2022
+openjdk:24-ea-18
+openjdk:24-ea-18-bookworm
+openjdk:24-ea-18-bullseye
+openjdk:24-ea-18-jdk
+openjdk:24-ea-18-jdk-bookworm
+openjdk:24-ea-18-jdk-bullseye
+openjdk:24-ea-18-jdk-nanoserver
+openjdk:24-ea-18-jdk-nanoserver-1809
+openjdk:24-ea-18-jdk-oracle
+openjdk:24-ea-18-jdk-oraclelinux8
+openjdk:24-ea-18-jdk-oraclelinux9
+openjdk:24-ea-18-jdk-slim
+openjdk:24-ea-18-jdk-slim-bookworm
+openjdk:24-ea-18-jdk-slim-bullseye
+openjdk:24-ea-18-jdk-windowsservercore
+openjdk:24-ea-18-jdk-windowsservercore-1809
+openjdk:24-ea-18-jdk-windowsservercore-ltsc2022
+openjdk:24-ea-18-nanoserver
+openjdk:24-ea-18-nanoserver-1809
+openjdk:24-ea-18-oracle
+openjdk:24-ea-18-oraclelinux8
+openjdk:24-ea-18-oraclelinux9
+openjdk:24-ea-18-slim
+openjdk:24-ea-18-slim-bookworm
+openjdk:24-ea-18-slim-bullseye
+openjdk:24-ea-18-windowsservercore
+openjdk:24-ea-18-windowsservercore-1809
+openjdk:24-ea-18-windowsservercore-ltsc2022
 openjdk:24-ea-bookworm
 openjdk:24-ea-bullseye
 openjdk:24-ea-jdk
diff --git a/openjdk_24-bookworm/Dockerfile b/openjdk_24-bookworm/Dockerfile
index ff82fb1..8a9c220 100644
--- a/openjdk_24-bookworm/Dockerfile
+++ b/openjdk_24-bookworm/Dockerfile
@@ -37,19 +37,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-bullseye/Dockerfile b/openjdk_24-bullseye/Dockerfile
index 63ab4d7..854e0ef 100644
--- a/openjdk_24-bullseye/Dockerfile
+++ b/openjdk_24-bullseye/Dockerfile
@@ -37,19 +37,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-nanoserver-1809/Dockerfile b/openjdk_24-nanoserver-1809/Dockerfile
index b9480bf..749651a 100644
--- a/openjdk_24-nanoserver-1809/Dockerfile
+++ b/openjdk_24-nanoserver-1809/Dockerfile
@@ -20,9 +20,9 @@ USER ContainerUser
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
-COPY --from=openjdk:24-ea-17-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=openjdk:24-ea-18-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
 	&& echo   javac --version && javac --version \
diff --git a/openjdk_24-oracle/Dockerfile b/openjdk_24-oracle/Dockerfile
index cee70a2..bec8d0b 100644
--- a/openjdk_24-oracle/Dockerfile
+++ b/openjdk_24-oracle/Dockerfile
@@ -30,19 +30,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
 	case "$arch" in \
 		'x86_64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'aarch64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-oraclelinux8/Dockerfile b/openjdk_24-oraclelinux8/Dockerfile
index d01d672..376436d 100644
--- a/openjdk_24-oraclelinux8/Dockerfile
+++ b/openjdk_24-oraclelinux8/Dockerfile
@@ -30,19 +30,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(rpm --query --queryformat='%{ARCH}' rpm)"; \
 	case "$arch" in \
 		'x86_64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'aarch64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-slim-bullseye/Dockerfile b/openjdk_24-slim-bullseye/Dockerfile
index 25dfa00..9d76b31 100644
--- a/openjdk_24-slim-bullseye/Dockerfile
+++ b/openjdk_24-slim-bullseye/Dockerfile
@@ -24,19 +24,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-slim/Dockerfile b/openjdk_24-slim/Dockerfile
index cd4b894..cc46202 100644
--- a/openjdk_24-slim/Dockerfile
+++ b/openjdk_24-slim/Dockerfile
@@ -24,19 +24,19 @@ ENV LANG C.UTF-8
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
+ENV JAVA_VERSION 24-ea+18
 
 RUN set -eux; \
 	\
 	arch="$(dpkg --print-architecture)"; \
 	case "$arch" in \
 		'amd64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-x64_bin.tar.gz'; \
-			downloadSha256='983faf25eff38b5b396afabd191a91b239a1d803a0dadd01863861ecf731f034'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz'; \
+			downloadSha256='04f26aabbc1c5cf21303b08acbd073e87b08bc8522a9f23db6995356cff4c9c1'; \
 			;; \
 		'arm64') \
-			downloadUrl='https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_linux-aarch64_bin.tar.gz'; \
-			downloadSha256='c9eb980b4f1fde9c2387e0fab6b91b6f68cb109e3ddd43eda0013d9ee345f2dc'; \
+			downloadUrl='https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-aarch64_bin.tar.gz'; \
+			downloadSha256='8cf1e6199534b6b9c57616ec38aac5ff15846eed5e82573ecf27535848d9e810'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture: '$arch'"; exit 1 ;; \
 	esac; \
diff --git a/openjdk_24-windowsservercore-1809/Dockerfile b/openjdk_24-windowsservercore-1809/Dockerfile
index cd8550c..69f3b16 100644
--- a/openjdk_24-windowsservercore-1809/Dockerfile
+++ b/openjdk_24-windowsservercore-1809/Dockerfile
@@ -33,9 +33,9 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
-ENV JAVA_URL https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_windows-x64_bin.zip
-ENV JAVA_SHA256 bf219cde78b52efb95b3b6fc5e4204bfdaeaaabfac61261ef44b662f774f44a9
+ENV JAVA_VERSION 24-ea+18
+ENV JAVA_URL https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_windows-x64_bin.zip
+ENV JAVA_SHA256 6146921a840c402763aa710b209d872b2b91ba63221f33e494fa1312cb2a706c
 
 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
diff --git a/openjdk_24-windowsservercore-ltsc2022/Dockerfile b/openjdk_24-windowsservercore-ltsc2022/Dockerfile
index 21d6c71..07e51a3 100644
--- a/openjdk_24-windowsservercore-ltsc2022/Dockerfile
+++ b/openjdk_24-windowsservercore-ltsc2022/Dockerfile
@@ -33,9 +33,9 @@ RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \
 # >
 # > Java Development Kit builds, from Oracle
 # >
-ENV JAVA_VERSION 24-ea+17
-ENV JAVA_URL https://download.java.net/java/early_access/jdk24/17/GPL/openjdk-24-ea+17_windows-x64_bin.zip
-ENV JAVA_SHA256 bf219cde78b52efb95b3b6fc5e4204bfdaeaaabfac61261ef44b662f774f44a9
+ENV JAVA_VERSION 24-ea+18
+ENV JAVA_URL https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_windows-x64_bin.zip
+ENV JAVA_SHA256 6146921a840c402763aa710b209d872b2b91ba63221f33e494fa1312cb2a706c
 
 RUN Write-Host ('Downloading {0} ...' -f $env:JAVA_URL); \
 	[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \

Relevant Maintainers:

@tianon tianon merged commit 0eb9317 into docker-library:master Oct 7, 2024
13 checks passed
@tianon tianon deleted the openjdk branch October 7, 2024 23:39
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.

2 participants