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

Fix JDK 17 Amazon Corretto directory #17881

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Conversation

keeganwitt
Copy link
Contributor

No description provided.

Copy link

Diff for 9e3a4c0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d7475b4..5723913 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -117,7 +117,7 @@ Tags: 8.10.2-jdk11-alpine, 8.10-jdk11-alpine, 8-jdk11-alpine, jdk11-alpine
 GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk11-alpine
 
-Tags: 8.10.2-jdk11-corretto, 8.10-jdk11-corretto, 8-jdk11-corretto, jdk11-corretto, 8.10.2-jdk11-corretto-al2023, 8.10-jdk11-corretto-al2023, 8-jdk11-corretto-al2023, jdk11-corretto-al2023, 8.10.2-jdk17-corretto, 8.10-jdk17-corretto, 8-jdk17-corretto, jdk17-corretto, 8.10.2-jdk17-corretto-al2023, 8.10-jdk17-corretto-al2023, 8-jdk17-corretto-al2023, jdk17-corretto-al2023
+Tags: 8.10.2-jdk11-corretto, 8.10-jdk11-corretto, 8-jdk11-corretto, jdk11-corretto, 8.10.2-jdk11-corretto-al2023, 8.10-jdk11-corretto-al2023, 8-jdk11-corretto-al2023, jdk11-corretto-al2023
 Architectures: amd64, arm64v8
 GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk11-corretto
@@ -136,6 +136,11 @@ Tags: 8.10.2-jdk17-alpine, 8.10-jdk17-alpine, 8-jdk17-alpine, jdk17-alpine, 8.10
 GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk17-alpine
 
+Tags: 8.10.2-jdk17-corretto, 8.10-jdk17-corretto, 8-jdk17-corretto, jdk17-corretto, 8.10.2-jdk17-corretto-al2023, 8.10-jdk17-corretto-al2023, 8-jdk17-corretto-al2023, jdk17-corretto-al2023
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk17-corretto
+
 Tags: 8.10.2-jdk17-focal, 8.10-jdk17-focal, 8-jdk17-focal, jdk17-focal, 8.10.2-jdk-focal, 8.10-jdk-focal, 8-jdk-focal, jdk-focal, 8.10.2-focal, 8.10-focal, 8-focal, focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index d5e089b..7aaa182 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -24,6 +24,7 @@ gradle:jdk8-corretto-al2023
 gradle:jdk8-focal
 gradle:jdk8-jammy
 gradle:jdk11-alpine
+gradle:jdk11-corretto-al2023
 gradle:jdk11-focal
 gradle:jdk11-jammy
 gradle:jdk17-corretto-al2023
diff --git a/gradle_jdk17-corretto-al2023/Dockerfile b/gradle_jdk11-corretto-al2023/Dockerfile
similarity index 100%
copy from gradle_jdk17-corretto-al2023/Dockerfile
copy to gradle_jdk11-corretto-al2023/Dockerfile
diff --git a/gradle_jdk17-corretto-al2023/Dockerfile b/gradle_jdk17-corretto-al2023/Dockerfile
index 4224704..40a23f8 100644
--- a/gradle_jdk17-corretto-al2023/Dockerfile
+++ b/gradle_jdk17-corretto-al2023/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11-al2023-jdk
+FROM amazoncorretto:17-al2023-jdk
 
 CMD ["gradle"]
 
@@ -32,7 +32,6 @@ RUN set -o errexit -o nounset \
     && useradd --system --gid gradle --uid 1000 --shell /bin/bash --create-home gradle \
     && mkdir /home/gradle/.gradle \
     && chown --recursive gradle:gradle /home/gradle \
-    && chmod --recursive o+rwx /home/gradle \
     \
     && echo "Symlinking root Gradle cache to gradle Gradle cache" \
     && ln --symbolic /home/gradle/.gradle /root/.gradle

Relevant Maintainers:

@yosifkit yosifkit merged commit 3243b50 into docker-library:master Nov 11, 2024
45 checks passed
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