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 Amazon Corretto images #17849

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Add Amazon Corretto images #17849

merged 1 commit into from
Nov 6, 2024

Conversation

keeganwitt
Copy link
Contributor

A user requested (keeganwitt/docker-gradle#301) Amazon Corretto based images be made available.

@keeganwitt keeganwitt requested a review from a team as a code owner November 6, 2024 04:22

This comment has been minimized.

Copy link

github-actions bot commented Nov 6, 2024

Diff for a14fe74:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6086ba9..d7475b4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -95,88 +95,113 @@ Directory: jdk17-focal
 
 Tags: 8.10.2-jdk8, 8.10-jdk8, 8-jdk8, jdk8, 8.10.2-jdk8-jammy, 8.10-jdk8-jammy, 8-jdk8-jammy, jdk8-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk8
 
+Tags: 8.10.2-jdk8-corretto, 8.10-jdk8-corretto, 8-jdk8-corretto, jdk8-corretto, 8.10.2-jdk8-corretto-al2023, 8.10-jdk8-corretto-al2023, 8-jdk8-corretto-al2023, jdk8-corretto-al2023
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk8-corretto
+
 Tags: 8.10.2-jdk8-focal, 8.10-jdk8-focal, 8-jdk8-focal, jdk8-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk8-focal
 
 Tags: 8.10.2-jdk11, 8.10-jdk11, 8-jdk11, jdk11, 8.10.2-jdk11-jammy, 8.10-jdk11-jammy, 8-jdk11-jammy, jdk11-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk11
 
 Tags: 8.10.2-jdk11-alpine, 8.10-jdk11-alpine, 8-jdk11-alpine, jdk11-alpine
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+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
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk11-corretto
+
 Tags: 8.10.2-jdk11-focal, 8.10-jdk11-focal, 8-jdk11-focal, jdk11-focal
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk11-focal
 
 Tags: 8.10.2-jdk17, 8.10-jdk17, 8-jdk17, jdk17, 8.10.2-jdk17-jammy, 8.10-jdk17-jammy, 8-jdk17-jammy, jdk17-jammy
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk17
 
 Tags: 8.10.2-jdk17-alpine, 8.10-jdk17-alpine, 8-jdk17-alpine, jdk17-alpine, 8.10.2-jdk-alpine, 8.10-jdk-alpine
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk17-alpine
 
 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: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk17-focal
 
 Tags: 8.10.2-jdk17-graal, 8.10-jdk17-graal, 8-jdk17-graal, jdk17-graal, 8.10.2-jdk-graal, 8.10-jdk-graal, 8-jdk-graal, jdk-graal, 8.10.2-graal, 8.10-graal, 8-graal, graal, 8.10.2-jdk17-graal-jammy, 8.10-jdk17-graal-jammy, 8-jdk17-graal-jammy, jdk17-graal-jammy, 8.10.2-jdk-graal-jammy, 8.10-jdk-graal-jammy, 8-jdk-graal-jammy, jdk-graal-jammy, 8.10.2-graal-jammy, 8.10-graal-jammy, 8-graal-jammy, graal-jammy
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk17-graal
 
 Tags: 8.10.2-jdk21, 8.10-jdk21, 8-jdk21, jdk21, 8.10.2-jdk21-jammy, 8.10-jdk21-jammy, 8-jdk21-jammy, jdk21-jammy, latest, 8.10.2-jdk, 8.10-jdk, 8-jdk, jdk, 8.10.2, 8.10, 8, 8.10.2-jdk-jammy, 8.10-jdk-jammy, 8-jdk-jammy, jdk-jammy, 8.10.2-jammy, 8.10-jammy, 8-jammy, jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk21
 
 Tags: 8.10.2-jdk21-alpine, 8.10-jdk21-alpine, 8-jdk21-alpine, jdk21-alpine, 8-jdk-alpine, jdk-alpine, 8.10.2-alpine, 8.10-alpine, 8-alpine, alpine
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk21-alpine
 
+Tags: 8.10.2-jdk21-corretto, 8.10-jdk21-corretto, 8-jdk21-corretto, jdk21-corretto, corretto, 8.10.2-jdk21-corretto-al2023, 8.10-jdk21-corretto-al2023, 8-jdk21-corretto-al2023, jdk21-corretto-al2023, corretto-al2023
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk21-corretto
+
 Tags: 8.10.2-jdk21-graal, 8.10-jdk21-graal, 8-jdk21-graal, jdk21-graal, 8.10.2-jdk21-graal-jammy, 8.10-jdk21-graal-jammy, 8-jdk21-graal-jammy, jdk21-graal-jammy
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk21-graal
 
 Tags: 8.10.2-jdk23, 8.10-jdk23, 8-jdk23, jdk23, 8.10.2-jdk23-jammy, 8.10-jdk23-jammy, 8-jdk23-jammy, jdk23-jammy
 Architectures: amd64, arm64v8, ppc64le, s390x
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk23
 
 Tags: 8.10.2-jdk23-alpine, 8.10-jdk23-alpine, 8-jdk23-alpine, jdk23-alpine
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk23-alpine
 
+Tags: 8.10.2-jdk23-corretto, 8.10-jdk23-corretto, 8-jdk23-corretto, jdk23-corretto
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk23-corretto
+
 Tags: 8.10.2-jdk23-graal, 8.10-jdk23-graal, 8-jdk23-graal, jdk23-graal
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk23-graal
 
 Tags: 8.10.2-jdk-lts-and-current, 8.10-jdk-lts-and-current, 8-jdk-lts-and-current, jdk-lts-and-current, 8.10.2-jdk-lts-and-current-jammy, 8.10-jdk-lts-and-current-jammy, 8-jdk-lts-and-current-jammy, jdk-lts-and-current-jammy, 8.10.2-jdk-21-and-23, 8.10-jdk-21-and-23, 8-jdk-21-and-23, jdk-21-and-23, 8.10.2-jdk-21-and-23-jammy, 8.10-jdk-21-and-23-jammy, 8-jdk-21-and-23-jammy, jdk-21-and-23-jammy
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk-lts-and-current
 
 Tags: 8.10.2-jdk-lts-and-current-alpine, 8.10-jdk-lts-and-current-alpine, 8-jdk-lts-and-current-alpine, jdk-lts-and-current-alpine, 8.10.2-jdk-21-and-23-alpine, 8.10-jdk-21-and-23-alpine, 8-jdk-21-and-23-alpine, jdk-21-and-23-alpine
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk-lts-and-current-alpine
 
+Tags: 8.10.2-jdk-lts-and-current-corretto, 8.10-jdk-lts-and-current-corretto, 8-jdk-lts-and-current-corretto, jdk-lts-and-current-corretto, 8.10.2-jdk-lts-and-current-corretto-al2023, 8.10-jdk-lts-and-current-corretto-al2023, 8-jdk-lts-and-current-corretto-al2023, jdk-lts-and-current-corretto-al2023, 8.10.2-jdk-21-and-23-corretto, 8.10-jdk-21-and-23-corretto, 8-jdk-21-and-23-corretto, jdk-21-and-23-corretto, 8.10.2-jdk-21-and-23-corretto-al2023, 8.10-jdk-21-and-23-corretto-al2023, 8-jdk-21-and-23-corretto-al2023, jdk-21-and-23-corretto-al2023
+Architectures: amd64, arm64v8
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
+Directory: jdk-lts-and-current-corretto
+
 Tags: 8.10.2-jdk-lts-and-current-graal, 8.10-jdk-lts-and-current-graal, 8-jdk-lts-and-current-graal, jdk-lts-and-current-graal, 8.10.2-jdk-lts-and-current-graal-jammy, 8.10-jdk-lts-and-current-graal-jammy, 8-jdk-lts-and-current-graal-jammy, jdk-lts-and-current-graal-jammy, 8.10.2-jdk-21-and-23-graal, 8.10-jdk-21-and-23-graal, 8-jdk-21-and-23-graal, jdk-21-and-23-graal, 8.10.2-jdk-21-and-23-graal-jammy, 8.10-jdk-21-and-23-graal-jammy, 8-jdk-21-and-23-graal-jammy, jdk-21-and-23-graal-jammy
 Architectures: amd64, arm64v8
-GitCommit: 1d17a9a8ffeac966db523f07dc8fa79dfc30a0f9
+GitCommit: d3b56becf2affe337173f9c88805f2ab687027f6
 Directory: jdk-lts-and-current-graal
diff --git a/_bashbrew-list b/_bashbrew-list
index 408584c..c4309b4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -120,29 +120,40 @@ gradle:8-graal-jammy
 gradle:8-jammy
 gradle:8-jdk
 gradle:8-jdk8
+gradle:8-jdk8-corretto
+gradle:8-jdk8-corretto-al2023
 gradle:8-jdk8-focal
 gradle:8-jdk8-jammy
 gradle:8-jdk11
 gradle:8-jdk11-alpine
+gradle:8-jdk11-corretto
+gradle:8-jdk11-corretto-al2023
 gradle:8-jdk11-focal
 gradle:8-jdk11-jammy
 gradle:8-jdk17
 gradle:8-jdk17-alpine
+gradle:8-jdk17-corretto
+gradle:8-jdk17-corretto-al2023
 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-corretto
+gradle:8-jdk21-corretto-al2023
 gradle:8-jdk21-graal
 gradle:8-jdk21-graal-jammy
 gradle:8-jdk21-jammy
 gradle:8-jdk23
 gradle:8-jdk23-alpine
+gradle:8-jdk23-corretto
 gradle:8-jdk23-graal
 gradle:8-jdk23-jammy
 gradle:8-jdk-21-and-23
 gradle:8-jdk-21-and-23-alpine
+gradle:8-jdk-21-and-23-corretto
+gradle:8-jdk-21-and-23-corretto-al2023
 gradle:8-jdk-21-and-23-graal
 gradle:8-jdk-21-and-23-graal-jammy
 gradle:8-jdk-21-and-23-jammy
@@ -153,6 +164,8 @@ gradle:8-jdk-graal-jammy
 gradle:8-jdk-jammy
 gradle:8-jdk-lts-and-current
 gradle:8-jdk-lts-and-current-alpine
+gradle:8-jdk-lts-and-current-corretto
+gradle:8-jdk-lts-and-current-corretto-al2023
 gradle:8-jdk-lts-and-current-graal
 gradle:8-jdk-lts-and-current-graal-jammy
 gradle:8-jdk-lts-and-current-jammy
@@ -164,29 +177,40 @@ gradle:8.10-graal-jammy
 gradle:8.10-jammy
 gradle:8.10-jdk
 gradle:8.10-jdk8
+gradle:8.10-jdk8-corretto
+gradle:8.10-jdk8-corretto-al2023
 gradle:8.10-jdk8-focal
 gradle:8.10-jdk8-jammy
 gradle:8.10-jdk11
 gradle:8.10-jdk11-alpine
+gradle:8.10-jdk11-corretto
+gradle:8.10-jdk11-corretto-al2023
 gradle:8.10-jdk11-focal
 gradle:8.10-jdk11-jammy
 gradle:8.10-jdk17
 gradle:8.10-jdk17-alpine
+gradle:8.10-jdk17-corretto
+gradle:8.10-jdk17-corretto-al2023
 gradle:8.10-jdk17-focal
 gradle:8.10-jdk17-graal
 gradle:8.10-jdk17-graal-jammy
 gradle:8.10-jdk17-jammy
 gradle:8.10-jdk21
 gradle:8.10-jdk21-alpine
+gradle:8.10-jdk21-corretto
+gradle:8.10-jdk21-corretto-al2023
 gradle:8.10-jdk21-graal
 gradle:8.10-jdk21-graal-jammy
 gradle:8.10-jdk21-jammy
 gradle:8.10-jdk23
 gradle:8.10-jdk23-alpine
+gradle:8.10-jdk23-corretto
 gradle:8.10-jdk23-graal
 gradle:8.10-jdk23-jammy
 gradle:8.10-jdk-21-and-23
 gradle:8.10-jdk-21-and-23-alpine
+gradle:8.10-jdk-21-and-23-corretto
+gradle:8.10-jdk-21-and-23-corretto-al2023
 gradle:8.10-jdk-21-and-23-graal
 gradle:8.10-jdk-21-and-23-graal-jammy
 gradle:8.10-jdk-21-and-23-jammy
@@ -197,6 +221,8 @@ gradle:8.10-jdk-graal-jammy
 gradle:8.10-jdk-jammy
 gradle:8.10-jdk-lts-and-current
 gradle:8.10-jdk-lts-and-current-alpine
+gradle:8.10-jdk-lts-and-current-corretto
+gradle:8.10-jdk-lts-and-current-corretto-al2023
 gradle:8.10-jdk-lts-and-current-graal
 gradle:8.10-jdk-lts-and-current-graal-jammy
 gradle:8.10-jdk-lts-and-current-jammy
@@ -208,29 +234,40 @@ gradle:8.10.2-graal-jammy
 gradle:8.10.2-jammy
 gradle:8.10.2-jdk
 gradle:8.10.2-jdk8
+gradle:8.10.2-jdk8-corretto
+gradle:8.10.2-jdk8-corretto-al2023
 gradle:8.10.2-jdk8-focal
 gradle:8.10.2-jdk8-jammy
 gradle:8.10.2-jdk11
 gradle:8.10.2-jdk11-alpine
+gradle:8.10.2-jdk11-corretto
+gradle:8.10.2-jdk11-corretto-al2023
 gradle:8.10.2-jdk11-focal
 gradle:8.10.2-jdk11-jammy
 gradle:8.10.2-jdk17
 gradle:8.10.2-jdk17-alpine
+gradle:8.10.2-jdk17-corretto
+gradle:8.10.2-jdk17-corretto-al2023
 gradle:8.10.2-jdk17-focal
 gradle:8.10.2-jdk17-graal
 gradle:8.10.2-jdk17-graal-jammy
 gradle:8.10.2-jdk17-jammy
 gradle:8.10.2-jdk21
 gradle:8.10.2-jdk21-alpine
+gradle:8.10.2-jdk21-corretto
+gradle:8.10.2-jdk21-corretto-al2023
 gradle:8.10.2-jdk21-graal
 gradle:8.10.2-jdk21-graal-jammy
 gradle:8.10.2-jdk21-jammy
 gradle:8.10.2-jdk23
 gradle:8.10.2-jdk23-alpine
+gradle:8.10.2-jdk23-corretto
 gradle:8.10.2-jdk23-graal
 gradle:8.10.2-jdk23-jammy
 gradle:8.10.2-jdk-21-and-23
 gradle:8.10.2-jdk-21-and-23-alpine
+gradle:8.10.2-jdk-21-and-23-corretto
+gradle:8.10.2-jdk-21-and-23-corretto-al2023
 gradle:8.10.2-jdk-21-and-23-graal
 gradle:8.10.2-jdk-21-and-23-graal-jammy
 gradle:8.10.2-jdk-21-and-23-jammy
@@ -241,39 +278,54 @@ gradle:8.10.2-jdk-graal-jammy
 gradle:8.10.2-jdk-jammy
 gradle:8.10.2-jdk-lts-and-current
 gradle:8.10.2-jdk-lts-and-current-alpine
+gradle:8.10.2-jdk-lts-and-current-corretto
+gradle:8.10.2-jdk-lts-and-current-corretto-al2023
 gradle:8.10.2-jdk-lts-and-current-graal
 gradle:8.10.2-jdk-lts-and-current-graal-jammy
 gradle:8.10.2-jdk-lts-and-current-jammy
 gradle:alpine
+gradle:corretto
+gradle:corretto-al2023
 gradle:focal
 gradle:graal
 gradle:graal-jammy
 gradle:jammy
 gradle:jdk
 gradle:jdk8
+gradle:jdk8-corretto
+gradle:jdk8-corretto-al2023
 gradle:jdk8-focal
 gradle:jdk8-jammy
 gradle:jdk11
 gradle:jdk11-alpine
+gradle:jdk11-corretto
+gradle:jdk11-corretto-al2023
 gradle:jdk11-focal
 gradle:jdk11-jammy
 gradle:jdk17
 gradle:jdk17-alpine
+gradle:jdk17-corretto
+gradle:jdk17-corretto-al2023
 gradle:jdk17-focal
 gradle:jdk17-graal
 gradle:jdk17-graal-jammy
 gradle:jdk17-jammy
 gradle:jdk21
 gradle:jdk21-alpine
+gradle:jdk21-corretto
+gradle:jdk21-corretto-al2023
 gradle:jdk21-graal
 gradle:jdk21-graal-jammy
 gradle:jdk21-jammy
 gradle:jdk23
 gradle:jdk23-alpine
+gradle:jdk23-corretto
 gradle:jdk23-graal
 gradle:jdk23-jammy
 gradle:jdk-21-and-23
 gradle:jdk-21-and-23-alpine
+gradle:jdk-21-and-23-corretto
+gradle:jdk-21-and-23-corretto-al2023
 gradle:jdk-21-and-23-graal
 gradle:jdk-21-and-23-graal-jammy
 gradle:jdk-21-and-23-jammy
@@ -284,6 +336,8 @@ gradle:jdk-graal-jammy
 gradle:jdk-jammy
 gradle:jdk-lts-and-current
 gradle:jdk-lts-and-current-alpine
+gradle:jdk-lts-and-current-corretto
+gradle:jdk-lts-and-current-corretto-al2023
 gradle:jdk-lts-and-current-graal
 gradle:jdk-lts-and-current-graal-jammy
 gradle:jdk-lts-and-current-jammy
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 01bb434..d5e089b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -16,19 +16,24 @@ gradle:7-jdk11-focal
 gradle:7-jdk11-jammy
 gradle:8.10-jdk-alpine
 gradle:alpine
+gradle:corretto-al2023
 gradle:focal
 gradle:graal-jammy
 gradle:jammy
+gradle:jdk8-corretto-al2023
 gradle:jdk8-focal
 gradle:jdk8-jammy
 gradle:jdk11-alpine
 gradle:jdk11-focal
 gradle:jdk11-jammy
+gradle:jdk17-corretto-al2023
 gradle:jdk17-jammy
 gradle:jdk21-graal-jammy
 gradle:jdk23-alpine
+gradle:jdk23-corretto
 gradle:jdk23-graal
 gradle:jdk23-jammy
 gradle:jdk-21-and-23-alpine
+gradle:jdk-21-and-23-corretto-al2023
 gradle:jdk-21-and-23-graal-jammy
 gradle:jdk-21-and-23-jammy
diff --git a/gradle_jdk8-focal/Dockerfile b/gradle_corretto-al2023/Dockerfile
similarity index 87%
copy from gradle_jdk8-focal/Dockerfile
copy to gradle_corretto-al2023/Dockerfile
index e691fee..d870b01 100644
--- a/gradle_jdk8-focal/Dockerfile
+++ b/gradle_corretto-al2023/Dockerfile
@@ -1,45 +1,46 @@
-FROM eclipse-temurin:8-jdk-focal
+FROM amazoncorretto:21-al2023-jdk
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME=/opt/gradle
 
 RUN set -o errexit -o nounset \
-    && echo "Adding gradle user and group" \
-    && groupadd --system --gid 1000 gradle \
-    && 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
-
-VOLUME /home/gradle/.gradle
-
-WORKDIR /home/gradle
-
-RUN set -o errexit -o nounset \
-    && apt-get update \
-    && apt-get install --yes --no-install-recommends \
+    && dnf install -y \
+        shadow-utils \
         unzip \
         wget \
+        which \
+        \
+        findutils \
         \
-        bzr \
         git \
         git-lfs \
         mercurial \
-        openssh-client \
         subversion \
-    && rm --recursive --force /var/lib/apt/lists/* \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
     \
     && echo "Testing VCSes" \
-    && which bzr \
     && which git \
     && which git-lfs \
     && which hg \
     && which svn
 
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 1000 gradle \
+    && 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
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
 ENV GRADLE_VERSION=8.10.2
 ARG GRADLE_DOWNLOAD_SHA256=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
 RUN set -o errexit -o nounset \
diff --git a/gradle_jdk-21-and-23-jammy/Dockerfile b/gradle_jdk-21-and-23-corretto-al2023/Dockerfile
similarity index 80%
copy from gradle_jdk-21-and-23-jammy/Dockerfile
copy to gradle_jdk-21-and-23-corretto-al2023/Dockerfile
index 40a7052..6e39628 100644
--- a/gradle_jdk-21-and-23-jammy/Dockerfile
+++ b/gradle_jdk-21-and-23-corretto-al2023/Dockerfile
@@ -1,15 +1,35 @@
-FROM eclipse-temurin:21-jdk-jammy
+FROM amazoncorretto:21-al2023-jdk
 
-COPY --from=eclipse-temurin:23-jdk-noble /opt/java/openjdk /opt/java/openjdk23
-RUN set -o errexit -o nounset \
-    && ln --symbolic /opt/java/openjdk /opt/java/openjdk21
-ENV JAVA_LTS_HOME=/opt/java/openjdk21
-ENV JAVA_CURRENT_HOME=/opt/java/openjdk23
+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
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME=/opt/gradle
 
+RUN set -o errexit -o nounset \
+    && dnf install -y \
+        shadow-utils \
+        unzip \
+        wget \
+        which \
+        \
+        findutils \
+        \
+        git \
+        git-lfs \
+        mercurial \
+        subversion \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
+    \
+    && echo "Testing VCSes" \
+    && which git \
+    && which git-lfs \
+    && which hg \
+    && which svn
+
 RUN set -o errexit -o nounset \
     && echo "Adding gradle user and group" \
     && groupadd --system --gid 1000 gradle \
@@ -29,27 +49,6 @@ VOLUME /home/gradle/.gradle
 
 WORKDIR /home/gradle
 
-RUN set -o errexit -o nounset \
-    && apt-get update \
-    && apt-get install --yes --no-install-recommends \
-        unzip \
-        wget \
-        \
-        bzr \
-        git \
-        git-lfs \
-        mercurial \
-        openssh-client \
-        subversion \
-    && rm --recursive --force /var/lib/apt/lists/* \
-    \
-    && echo "Testing VCSes" \
-    && which bzr \
-    && which git \
-    && which git-lfs \
-    && which hg \
-    && which svn
-
 ENV GRADLE_VERSION=8.10.2
 ARG GRADLE_DOWNLOAD_SHA256=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
 RUN set -o errexit -o nounset \
diff --git a/gradle_jdk8-focal/Dockerfile b/gradle_jdk17-corretto-al2023/Dockerfile
similarity index 87%
copy from gradle_jdk8-focal/Dockerfile
copy to gradle_jdk17-corretto-al2023/Dockerfile
index e691fee..4224704 100644
--- a/gradle_jdk8-focal/Dockerfile
+++ b/gradle_jdk17-corretto-al2023/Dockerfile
@@ -1,45 +1,46 @@
-FROM eclipse-temurin:8-jdk-focal
+FROM amazoncorretto:11-al2023-jdk
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME=/opt/gradle
 
 RUN set -o errexit -o nounset \
-    && echo "Adding gradle user and group" \
-    && groupadd --system --gid 1000 gradle \
-    && 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
-
-VOLUME /home/gradle/.gradle
-
-WORKDIR /home/gradle
-
-RUN set -o errexit -o nounset \
-    && apt-get update \
-    && apt-get install --yes --no-install-recommends \
+    && dnf install -y \
+        shadow-utils \
         unzip \
         wget \
+        which \
+        \
+        findutils \
         \
-        bzr \
         git \
         git-lfs \
         mercurial \
-        openssh-client \
         subversion \
-    && rm --recursive --force /var/lib/apt/lists/* \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
     \
     && echo "Testing VCSes" \
-    && which bzr \
     && which git \
     && which git-lfs \
     && which hg \
     && which svn
 
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 1000 gradle \
+    && 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
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
 ENV GRADLE_VERSION=8.10.2
 ARG GRADLE_DOWNLOAD_SHA256=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
 RUN set -o errexit -o nounset \
diff --git a/gradle_jdk8-focal/Dockerfile b/gradle_jdk23-corretto/Dockerfile
similarity index 87%
copy from gradle_jdk8-focal/Dockerfile
copy to gradle_jdk23-corretto/Dockerfile
index e691fee..74e8d07 100644
--- a/gradle_jdk8-focal/Dockerfile
+++ b/gradle_jdk23-corretto/Dockerfile
@@ -1,45 +1,46 @@
-FROM eclipse-temurin:8-jdk-focal
+FROM amazoncorretto:23-al2023-jdk
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME=/opt/gradle
 
 RUN set -o errexit -o nounset \
-    && echo "Adding gradle user and group" \
-    && groupadd --system --gid 1000 gradle \
-    && 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
-
-VOLUME /home/gradle/.gradle
-
-WORKDIR /home/gradle
-
-RUN set -o errexit -o nounset \
-    && apt-get update \
-    && apt-get install --yes --no-install-recommends \
+    && dnf install -y \
+        shadow-utils \
         unzip \
         wget \
+        which \
+        \
+        findutils \
         \
-        bzr \
         git \
         git-lfs \
         mercurial \
-        openssh-client \
         subversion \
-    && rm --recursive --force /var/lib/apt/lists/* \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
     \
     && echo "Testing VCSes" \
-    && which bzr \
     && which git \
     && which git-lfs \
     && which hg \
     && which svn
 
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 1000 gradle \
+    && 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
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
 ENV GRADLE_VERSION=8.10.2
 ARG GRADLE_DOWNLOAD_SHA256=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
 RUN set -o errexit -o nounset \
diff --git a/gradle_jdk8-focal/Dockerfile b/gradle_jdk8-corretto-al2023/Dockerfile
similarity index 87%
copy from gradle_jdk8-focal/Dockerfile
copy to gradle_jdk8-corretto-al2023/Dockerfile
index e691fee..30b23c2 100644
--- a/gradle_jdk8-focal/Dockerfile
+++ b/gradle_jdk8-corretto-al2023/Dockerfile
@@ -1,45 +1,46 @@
-FROM eclipse-temurin:8-jdk-focal
+FROM amazoncorretto:8-al2023-jdk
 
 CMD ["gradle"]
 
 ENV GRADLE_HOME=/opt/gradle
 
 RUN set -o errexit -o nounset \
-    && echo "Adding gradle user and group" \
-    && groupadd --system --gid 1000 gradle \
-    && 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
-
-VOLUME /home/gradle/.gradle
-
-WORKDIR /home/gradle
-
-RUN set -o errexit -o nounset \
-    && apt-get update \
-    && apt-get install --yes --no-install-recommends \
+    && dnf install -y \
+        shadow-utils \
         unzip \
         wget \
+        which \
+        \
+        findutils \
         \
-        bzr \
         git \
         git-lfs \
         mercurial \
-        openssh-client \
         subversion \
-    && rm --recursive --force /var/lib/apt/lists/* \
+    && dnf clean all \
+    && rm -rf /var/cache/yum \
     \
     && echo "Testing VCSes" \
-    && which bzr \
     && which git \
     && which git-lfs \
     && which hg \
     && which svn
 
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && groupadd --system --gid 1000 gradle \
+    && 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
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
 ENV GRADLE_VERSION=8.10.2
 ARG GRADLE_DOWNLOAD_SHA256=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
 RUN set -o errexit -o nounset \

Relevant Maintainers:

@tianon tianon merged commit 28f0fbb into docker-library:master Nov 6, 2024
44 checks passed
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: jdk11-corretto

Choose a reason for hiding this comment

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

@keeganwitt
Could it be that the Directory: jdk11-corretto should actually be Directory: jdk17-corretto?

Could you kindly confirm when you have a moment?
Thank you!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch! This was a mistake. #17881 opened to fix this.

Choose a reason for hiding this comment

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

Thank you for addressing the feedback! I appreciate the quick updates.

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