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

Add Java 21 images #15537

Merged
merged 1 commit into from
Oct 14, 2023
Merged

Add Java 21 images #15537

merged 1 commit into from
Oct 14, 2023

Conversation

keeganwitt
Copy link
Contributor

Related doc update: docker-library/docs#2378

@github-actions

This comment has been minimized.

@github-actions
Copy link

Diff for 8ad8c14:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 725d7b7..f6fb318 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -95,43 +95,57 @@ Directory: jdk17-focal
 
 Tags: 8.4.0-jdk8, 8.4-jdk8, 8-jdk8, jdk8, 8.4.0-jdk8-jammy, 8.4-jdk8-jammy, 8-jdk8-jammy, jdk8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk8
 
 Tags: 8.4.0-jdk8-focal, 8.4-jdk8-focal, 8-jdk8-focal, jdk8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk8-focal
 
 Tags: 8.4.0-jdk11, 8.4-jdk11, 8-jdk11, jdk11, 8.4.0-jdk11-jammy, 8.4-jdk11-jammy, 8-jdk11-jammy, jdk11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk11
 
 Tags: 8.4.0-jdk11-alpine, 8.4-jdk11-alpine, 8-jdk11-alpine, jdk11-alpine
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk11-alpine
 
 Tags: 8.4.0-jdk11-focal, 8.4-jdk11-focal, 8-jdk11-focal, jdk11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk11-focal
 
 Tags: 8.4.0-jdk17, 8.4-jdk17, 8-jdk17, jdk17, 8.4.0-jdk, 8.4-jdk, 8-jdk, jdk, 8.4.0, 8.4, 8, latest, 8.4.0-jdk17-jammy, 8.4-jdk17-jammy, 8-jdk17-jammy, jdk17-jammy, 8.4.0-jdk-jammy, 8.4-jdk-jammy, 8-jdk-jammy, jdk-jammy, 8.4.0-jammy, 8.4-jammy, 8-jammy, jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk17
 
 Tags: 8.4.0-jdk17-alpine, 8.4-jdk17-alpine, 8-jdk17-alpine, jdk17-alpine, 8.4.0-jdk-alpine, 8.4-jdk-alpine, 8-jdk-alpine, jdk-alpine, 8.4.0-alpine, 8.4-alpine, 8-alpine, alpine
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk17-alpine
 
 Tags: 8.4.0-jdk17-focal, 8.4-jdk17-focal, 8-jdk17-focal, jdk17-focal, 8.4.0-jdk-focal, 8.4-jdk-focal, 8-jdk-focal, jdk-focal, 8.4.0-focal, 8.4-focal, 8-focal, focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk17-focal
 
 Tags: 8.4.0-jdk17-graal, 8.4-jdk17-graal, 8-jdk17-graal, jdk17-graal, 8.4.0-jdk-graal, 8.4-jdk-graal, 8-jdk-graal, jdk-graal, 8.4.0-graal, 8.4-graal, 8-graal, graal, 8.4.0-jdk17-graal-jammy, 8.4-jdk17-graal-jammy, 8-jdk17-graal-jammy, jdk17-graal-jammy, 8.4.0-jdk-graal-jammy, 8.4-jdk-graal-jammy, 8-jdk-graal-jammy, jdk-graal-jammy, 8.4.0-graal-jammy, 8.4-graal-jammy, 8-graal-jammy, graal-jammy
 Architectures: amd64, arm64v8
-GitCommit: ae8311e2e41fbd2837f7a39df7e4b24e00f9b905
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
 Directory: jdk17-graal
+
+Tags: 8.4.0-jdk21, 8.4-jdk21, 8-jdk21, jdk21, 8.4.0-jdk21-jammy, 8.4-jdk21-jammy, 8-jdk21-jammy, jdk21-jammy
+Architectures: amd64, arm64v8
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
+Directory: jdk21
+
+Tags: 8.4.0-jdk21-alpine, 8.4-jdk21-alpine, 8-jdk21-alpine, jdk21-alpine
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
+Directory: jdk21-alpine
+
+Tags: 8.4.0-jdk21-graal, 8.4-jdk21-graal, 8-jdk21-graal, jdk21-graal, 8.4.0-jdk21-graal-jammy, 8.4-jdk21-graal-jammy, 8-jdk21-graal-jammy, jdk21-graal-jammy
+Architectures: amd64, arm64v8
+GitCommit: 8d22e033a49acb24572502355618cfa3dbb345bd
+Directory: jdk21-graal
diff --git a/_bashbrew-list b/_bashbrew-list
index be70990..7337e5f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -132,6 +132,11 @@ gradle:8-jdk17-focal
 gradle:8-jdk17-graal
 gradle:8-jdk17-graal-jammy
 gradle:8-jdk17-jammy
+gradle:8-jdk21
+gradle:8-jdk21-alpine
+gradle:8-jdk21-graal
+gradle:8-jdk21-graal-jammy
+gradle:8-jdk21-jammy
 gradle:8-jdk-alpine
 gradle:8-jdk-focal
 gradle:8-jdk-graal
@@ -157,6 +162,11 @@ gradle:8.4-jdk17-focal
 gradle:8.4-jdk17-graal
 gradle:8.4-jdk17-graal-jammy
 gradle:8.4-jdk17-jammy
+gradle:8.4-jdk21
+gradle:8.4-jdk21-alpine
+gradle:8.4-jdk21-graal
+gradle:8.4-jdk21-graal-jammy
+gradle:8.4-jdk21-jammy
 gradle:8.4-jdk-alpine
 gradle:8.4-jdk-focal
 gradle:8.4-jdk-graal
@@ -182,6 +192,11 @@ gradle:8.4.0-jdk17-focal
 gradle:8.4.0-jdk17-graal
 gradle:8.4.0-jdk17-graal-jammy
 gradle:8.4.0-jdk17-jammy
+gradle:8.4.0-jdk21
+gradle:8.4.0-jdk21-alpine
+gradle:8.4.0-jdk21-graal
+gradle:8.4.0-jdk21-graal-jammy
+gradle:8.4.0-jdk21-jammy
 gradle:8.4.0-jdk-alpine
 gradle:8.4.0-jdk-focal
 gradle:8.4.0-jdk-graal
@@ -206,6 +221,11 @@ gradle:jdk17-focal
 gradle:jdk17-graal
 gradle:jdk17-graal-jammy
 gradle:jdk17-jammy
+gradle:jdk21
+gradle:jdk21-alpine
+gradle:jdk21-graal
+gradle:jdk21-graal-jammy
+gradle:jdk21-jammy
 gradle:jdk-alpine
 gradle:jdk-focal
 gradle:jdk-graal
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index fae6b11..d1ccdac 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -23,3 +23,6 @@ gradle:jammy
 gradle:alpine
 gradle:focal
 gradle:graal-jammy
+gradle:jdk21-jammy
+gradle:jdk21-alpine
+gradle:jdk21-graal-jammy
diff --git a/gradle_alpine/Dockerfile b/gradle_jdk21-alpine/Dockerfile
similarity index 97%
copy from gradle_alpine/Dockerfile
copy to gradle_jdk21-alpine/Dockerfile
index c2e2ec4..1b39264 100644
--- a/gradle_alpine/Dockerfile
+++ b/gradle_jdk21-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 
 CMD ["gradle"]
 
diff --git a/gradle_graal-jammy/Dockerfile b/gradle_jdk21-graal-jammy/Dockerfile
similarity index 95%
copy from gradle_graal-jammy/Dockerfile
copy to gradle_jdk21-graal-jammy/Dockerfile
index 0be6bbc..fe25ad7 100644
--- a/gradle_graal-jammy/Dockerfile
+++ b/gradle_jdk21-graal-jammy/Dockerfile
@@ -53,12 +53,12 @@ RUN set -o errexit -o nounset \
     && which svn
 
 ENV JAVA_HOME=/opt/java/graalvm
-ENV JAVA_VERSION=17.0.8
+ENV JAVA_VERSION=21.0.0
 RUN set -o errexit -o nounset \
     && mkdir /opt/java \
     \
     && echo "Downloading GraalVM" \
-    && GRAALVM_DOWNLOAD_SHA256=1dffdf5c7cc5bf38558e9f093eef6a14072a6dff0be3a9906208b37b53ecc009 \
+    && GRAALVM_DOWNLOAD_SHA256=6c422941ccc58be5b891bb6499feeb72cd2b74d6729a29bf1fb8cc1a7d58b319 \
     && ARCHITECTURE=$(dpkg --print-architecture) \
     && if [ "${ARCHITECTURE}" = "amd64" ]; then GRAALVM_ARCHITECTURE=linux-x64; fi \
     && if [ "${ARCHITECTURE}" = "arm64" ]; then GRAALVM_ARCHITECTURE=linux-aarch64; fi \
@@ -81,7 +81,6 @@ RUN set -o errexit -o nounset \
     && echo "Testing GraalVM installation" \
     && java --version \
     && javac --version \
-    && gu --version \
     && native-image --version
 
 ENV GRADLE_VERSION 8.4
diff --git a/gradle_focal/Dockerfile b/gradle_jdk21-jammy/Dockerfile
similarity index 98%
copy from gradle_focal/Dockerfile
copy to gradle_jdk21-jammy/Dockerfile
index 6789982..f3a4c7f 100644
--- a/gradle_focal/Dockerfile
+++ b/gradle_jdk21-jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-focal
+FROM eclipse-temurin:21-jdk-jammy
 
 CMD ["gradle"]

Relevant Maintainers:

@yosifkit yosifkit merged commit 15b7f2f into docker-library:master Oct 14, 2023
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