-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Fix jdk-lts-and-current-corretto aarch64 compatibility #17936
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 7fee347:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9fc97fd..21c8456 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -95,118 +95,118 @@ Directory: jdk17-focal
Tags: 8.11.0-jdk8, 8.11-jdk8, 8-jdk8, jdk8, 8.11.0-jdk8-jammy, 8.11-jdk8-jammy, 8-jdk8-jammy, jdk8-jammy
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk8
Tags: 8.11.0-jdk8-corretto, 8.11-jdk8-corretto, 8-jdk8-corretto, jdk8-corretto, 8.11.0-jdk8-corretto-al2023, 8.11-jdk8-corretto-al2023, 8-jdk8-corretto-al2023, jdk8-corretto-al2023
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk8-corretto
Tags: 8.11.0-jdk8-focal, 8.11-jdk8-focal, 8-jdk8-focal, jdk8-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk8-focal
Tags: 8.11.0-jdk11, 8.11-jdk11, 8-jdk11, jdk11, 8.11.0-jdk11-jammy, 8.11-jdk11-jammy, 8-jdk11-jammy, jdk11-jammy
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk11
Tags: 8.11.0-jdk11-alpine, 8.11-jdk11-alpine, 8-jdk11-alpine, jdk11-alpine
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk11-alpine
Tags: 8.11.0-jdk11-corretto, 8.11-jdk11-corretto, 8-jdk11-corretto, jdk11-corretto, 8.11.0-jdk11-corretto-al2023, 8.11-jdk11-corretto-al2023, 8-jdk11-corretto-al2023, jdk11-corretto-al2023
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk11-corretto
Tags: 8.11.0-jdk11-focal, 8.11-jdk11-focal, 8-jdk11-focal, jdk11-focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk11-focal
Tags: 8.11.0-jdk17, 8.11-jdk17, 8-jdk17, jdk17, 8.11.0-jdk17-jammy, 8.11-jdk17-jammy, 8-jdk17-jammy, jdk17-jammy
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk17
Tags: 8.11.0-jdk17-alpine, 8.11-jdk17-alpine, 8-jdk17-alpine, jdk17-alpine, 8.11.0-jdk-alpine, 8.11-jdk-alpine
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk17-alpine
Tags: 8.11.0-jdk17-corretto, 8.11-jdk17-corretto, 8-jdk17-corretto, jdk17-corretto, 8.11.0-jdk17-corretto-al2023, 8.11-jdk17-corretto-al2023, 8-jdk17-corretto-al2023, jdk17-corretto-al2023
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk17-corretto
Tags: 8.11.0-jdk17-focal, 8.11-jdk17-focal, 8-jdk17-focal, jdk17-focal, 8.11.0-jdk-focal, 8.11-jdk-focal, 8-jdk-focal, jdk-focal, 8.11.0-focal, 8.11-focal, 8-focal, focal
Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk17-focal
Tags: 8.11.0-jdk17-graal, 8.11-jdk17-graal, 8-jdk17-graal, jdk17-graal, 8.11.0-jdk-graal, 8.11-jdk-graal, 8-jdk-graal, jdk-graal, 8.11.0-graal, 8.11-graal, 8-graal, graal, 8.11.0-jdk17-graal-jammy, 8.11-jdk17-graal-jammy, 8-jdk17-graal-jammy, jdk17-graal-jammy, 8.11.0-jdk-graal-jammy, 8.11-jdk-graal-jammy, 8-jdk-graal-jammy, jdk-graal-jammy, 8.11.0-graal-jammy, 8.11-graal-jammy, 8-graal-jammy, graal-jammy
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk17-graal
Tags: 8.11.0-jdk21, 8.11-jdk21, 8-jdk21, jdk21, 8.11.0-jdk21-jammy, 8.11-jdk21-jammy, 8-jdk21-jammy, jdk21-jammy, latest, 8.11.0-jdk, 8.11-jdk, 8-jdk, jdk, 8.11.0, 8.11, 8, 8.11.0-jdk-jammy, 8.11-jdk-jammy, 8-jdk-jammy, jdk-jammy, 8.11.0-jammy, 8.11-jammy, 8-jammy, jammy
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk21
Tags: 8.11.0-jdk21-alpine, 8.11-jdk21-alpine, 8-jdk21-alpine, jdk21-alpine, 8-jdk-alpine, jdk-alpine, 8.11.0-alpine, 8.11-alpine, 8-alpine, alpine
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk21-alpine
Tags: 8.11.0-jdk21-corretto, 8.11-jdk21-corretto, 8-jdk21-corretto, jdk21-corretto, corretto, 8.11.0-jdk21-corretto-al2023, 8.11-jdk21-corretto-al2023, 8-jdk21-corretto-al2023, jdk21-corretto-al2023, corretto-al2023
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk21-corretto
Tags: 8.11.0-jdk21-graal, 8.11-jdk21-graal, 8-jdk21-graal, jdk21-graal, 8.11.0-jdk21-graal-jammy, 8.11-jdk21-graal-jammy, 8-jdk21-graal-jammy, jdk21-graal-jammy
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk21-graal
Tags: 8.11.0-jdk23, 8.11-jdk23, 8-jdk23, jdk23, 8.11.0-jdk23-jammy, 8.11-jdk23-jammy, 8-jdk23-jammy, jdk23-jammy
Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk23
Tags: 8.11.0-jdk23-alpine, 8.11-jdk23-alpine, 8-jdk23-alpine, jdk23-alpine
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk23-alpine
Tags: 8.11.0-jdk23-corretto, 8.11-jdk23-corretto, 8-jdk23-corretto, jdk23-corretto
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk23-corretto
Tags: 8.11.0-jdk23-graal, 8.11-jdk23-graal, 8-jdk23-graal, jdk23-graal
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk23-graal
Tags: 8.11.0-jdk-lts-and-current, 8.11-jdk-lts-and-current, 8-jdk-lts-and-current, jdk-lts-and-current, 8.11.0-jdk-lts-and-current-jammy, 8.11-jdk-lts-and-current-jammy, 8-jdk-lts-and-current-jammy, jdk-lts-and-current-jammy, 8.11.0-jdk-21-and-23, 8.11-jdk-21-and-23, 8-jdk-21-and-23, jdk-21-and-23, 8.11.0-jdk-21-and-23-jammy, 8.11-jdk-21-and-23-jammy, 8-jdk-21-and-23-jammy, jdk-21-and-23-jammy
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk-lts-and-current
Tags: 8.11.0-jdk-lts-and-current-alpine, 8.11-jdk-lts-and-current-alpine, 8-jdk-lts-and-current-alpine, jdk-lts-and-current-alpine, 8.11.0-jdk-21-and-23-alpine, 8.11-jdk-21-and-23-alpine, 8-jdk-21-and-23-alpine, jdk-21-and-23-alpine
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk-lts-and-current-alpine
Tags: 8.11.0-jdk-lts-and-current-corretto, 8.11-jdk-lts-and-current-corretto, 8-jdk-lts-and-current-corretto, jdk-lts-and-current-corretto, 8.11.0-jdk-lts-and-current-corretto-al2023, 8.11-jdk-lts-and-current-corretto-al2023, 8-jdk-lts-and-current-corretto-al2023, jdk-lts-and-current-corretto-al2023, 8.11.0-jdk-21-and-23-corretto, 8.11-jdk-21-and-23-corretto, 8-jdk-21-and-23-corretto, jdk-21-and-23-corretto, 8.11.0-jdk-21-and-23-corretto-al2023, 8.11-jdk-21-and-23-corretto-al2023, 8-jdk-21-and-23-corretto-al2023, jdk-21-and-23-corretto-al2023
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk-lts-and-current-corretto
Tags: 8.11.0-jdk-lts-and-current-graal, 8.11-jdk-lts-and-current-graal, 8-jdk-lts-and-current-graal, jdk-lts-and-current-graal, 8.11.0-jdk-lts-and-current-graal-jammy, 8.11-jdk-lts-and-current-graal-jammy, 8-jdk-lts-and-current-graal-jammy, jdk-lts-and-current-graal-jammy, 8.11.0-jdk-21-and-23-graal, 8.11-jdk-21-and-23-graal, 8-jdk-21-and-23-graal, jdk-21-and-23-graal, 8.11.0-jdk-21-and-23-graal-jammy, 8.11-jdk-21-and-23-graal-jammy, 8-jdk-21-and-23-graal-jammy, jdk-21-and-23-graal-jammy
Architectures: amd64, arm64v8
-GitCommit: e1ea9198e1be5dbd68d788ddc4c171f40010a46e
+GitCommit: 101961f7dcee5e9f97f060a48e7f66ddf8888c2a
Directory: jdk-lts-and-current-graal
diff --git a/gradle_jdk-21-and-23-corretto-al2023/Dockerfile b/gradle_jdk-21-and-23-corretto-al2023/Dockerfile
index c979b64..35f46e3 100644
--- a/gradle_jdk-21-and-23-corretto-al2023/Dockerfile
+++ b/gradle_jdk-21-and-23-corretto-al2023/Dockerfile
@@ -1,8 +1,8 @@
FROM amazoncorretto:21-al2023-jdk
-COPY --from=amazoncorretto:23-al2023-jdk /usr/lib/jvm/java-23-amazon-corretto.x86_64 /usr/lib/jvm/java-23-amazon-corretto.x86_64
-ENV JAVA_LTS_HOME=/usr/lib/jvm/java-21-amazon-corretto.x86_64
-ENV JAVA_CURRENT_HOME=/usr/lib/jvm/java-23-amazon-corretto.x86_64
+COPY --from=amazoncorretto:23-al2023-jdk /usr/lib/jvm/java-23-amazon-corretto /usr/lib/jvm/java-23-amazon-corretto
+ENV JAVA_LTS_HOME=/usr/lib/jvm/java-21-amazon-corretto
+ENV JAVA_CURRENT_HOME=/usr/lib/jvm/java-23-amazon-corretto
CMD ["gradle"] Relevant Maintainers:
|
yosifkit
approved these changes
Nov 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.