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.

Sign up for GitHub

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

Jump to bottom

Add Corretto23 images #17593

Merged
merged 1 commit into from
Sep 20, 2024
Merged

Add Corretto23 images #17593

merged 1 commit into from
Sep 20, 2024
+30 −2

Conversation

chadrako
Copy link
Contributor

Add Corretto23 official images now that Corretto23 is available for general access

@chadrako chadrako requested a review from a team as a code owner September 19, 2024 23:53
@github-actions GitHub Actions
Copy link

Diff for f83a646: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6a8b7a6..8a3bbab 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Amazon Corretto Team <[email protected]> (@corretto), Dan Lutker <[email protected]> (@lutkerd), Ben Taylor <[email protected]> (@benty-amzn), David Alvarez <[email protected]> (@alvdavi), Rui Li <[email protected]> (@rgithubli), Sergey Bylokhov <[email protected]> (@mrserb), Victor Rudometov <[email protected]> (@Rudometov), Elif Aslan <[email protected]> (@elifaslan1), Autumn Capasso <[email protected]> (@Autumn808), Chad Rakoczy <[email protected]> (@chadrako)
 GitRepo: https://github.com/corretto/corretto-docker.git
 GitFetch: refs/heads/main
-GitCommit: cdcc44b8859544a47ce8c64ed0b3cc051a8c58c8
+GitCommit: 7973d342bbc1aeead4e4edc37cd966f5874e5f22
 
 Tags: 8, 8u422, 8u422-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u422-al2-generic, 8-al2-generic-jdk, latest
 Architectures: amd64, arm64v8
@@ -194,3 +194,31 @@ Directory: 22/jdk/alpine/3.19
 Tags: 22-alpine3.20, 22.0.2-alpine3.20, 22-alpine3.20-full, 22-alpine3.20-jdk, 22-alpine, 22.0.2-alpine, 22-alpine-full, 22-alpine-jdk
 Architectures: amd64, arm64v8
 Directory: 22/jdk/alpine/3.20
+
+Tags: 23-al2023, 23.0.0-al2023, 23-al2023-jdk, 23, 23-jdk
+Architectures: amd64, arm64v8
+Directory: 23/jdk/al2023
+
+Tags: 23-al2023-headful, 23.0.0-al2023-headful, 23-headful
+Architectures: amd64, arm64v8
+Directory: 23/headful/al2023
+
+Tags: 23-al2023-headless, 23.0.0-al2023-headless, 23-headless
+Architectures: amd64, arm64v8
+Directory: 23/headless/al2023
+
+Tags: 23-alpine3.17, 23.0.0-alpine3.17, 23-alpine3.17-full, 23-alpine3.17-jdk
+Architectures: amd64, arm64v8
+Directory: 23/jdk/alpine/3.17
+
+Tags: 23-alpine3.18, 23.0.0-alpine3.18, 23-alpine3.18-full, 23-alpine3.18-jdk
+Architectures: amd64, arm64v8
+Directory: 23/jdk/alpine/3.18
+
+Tags: 23-alpine3.19, 23.0.0-alpine3.19, 23-alpine3.19-full, 23-alpine3.19-jdk
+Architectures: amd64, arm64v8
+Directory: 23/jdk/alpine/3.19
+
+Tags: 23-alpine3.20, 23.0.0-alpine3.20, 23-alpine3.20-full, 23-alpine3.20-jdk, 23-alpine, 23.0.0-alpine, 23-alpine-full, 23-alpine-jdk
+Architectures: amd64, arm64v8
+Directory: 23/jdk/alpine/3.20
diff --git a/_bashbrew-list b/_bashbrew-list
index 20274af..371218e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -191,4 +191,35 @@ amazoncorretto:22.0.2-alpine3.17
 amazoncorretto:22.0.2-alpine3.18
 amazoncorretto:22.0.2-alpine3.19
 amazoncorretto:22.0.2-alpine3.20
+amazoncorretto:23
+amazoncorretto:23-al2023
+amazoncorretto:23-al2023-headful
+amazoncorretto:23-al2023-headless
+amazoncorretto:23-al2023-jdk
+amazoncorretto:23-alpine
+amazoncorretto:23-alpine3.17
+amazoncorretto:23-alpine3.17-full
+amazoncorretto:23-alpine3.17-jdk
+amazoncorretto:23-alpine3.18
+amazoncorretto:23-alpine3.18-full
+amazoncorretto:23-alpine3.18-jdk
+amazoncorretto:23-alpine3.19
+amazoncorretto:23-alpine3.19-full
+amazoncorretto:23-alpine3.19-jdk
+amazoncorretto:23-alpine3.20
+amazoncorretto:23-alpine3.20-full
+amazoncorretto:23-alpine3.20-jdk
+amazoncorretto:23-alpine-full
+amazoncorretto:23-alpine-jdk
+amazoncorretto:23-headful
+amazoncorretto:23-headless
+amazoncorretto:23-jdk
+amazoncorretto:23.0.0-al2023
+amazoncorretto:23.0.0-al2023-headful
+amazoncorretto:23.0.0-al2023-headless
+amazoncorretto:23.0.0-alpine
+amazoncorretto:23.0.0-alpine3.17
+amazoncorretto:23.0.0-alpine3.18
+amazoncorretto:23.0.0-alpine3.19
+amazoncorretto:23.0.0-alpine3.20
 amazoncorretto:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 915e197..44773fc 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -45,4 +45,11 @@ amazoncorretto:22-alpine-jdk
 amazoncorretto:22-headful
 amazoncorretto:22-headless
 amazoncorretto:22-jdk
+amazoncorretto:23-alpine3.17-jdk
+amazoncorretto:23-alpine3.18-jdk
+amazoncorretto:23-alpine3.19-jdk
+amazoncorretto:23-alpine-jdk
+amazoncorretto:23-headful
+amazoncorretto:23-headless
+amazoncorretto:23-jdk
 amazoncorretto:latest
diff --git a/amazoncorretto_17-alpine-jdk/Dockerfile b/amazoncorretto_23-alpine-jdk/Dockerfile
similarity index 87%
copy from amazoncorretto_17-alpine-jdk/Dockerfile
copy to amazoncorretto_23-alpine-jdk/Dockerfile
index d133215..b1aa353 100644
--- a/amazoncorretto_17-alpine-jdk/Dockerfile
+++ b/amazoncorretto_23-alpine-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.20
 
-ARG version=17.0.12.7.1
+ARG version=23.0.0.37.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
@@ -12,8 +12,8 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
     SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
     echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
     echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-17=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip
+    apk add --no-cache amazon-corretto-23=$version-r0 && \
+    rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip
 
 
 ENV LANG C.UTF-8
diff --git a/amazoncorretto_17-alpine3.17-jdk/Dockerfile b/amazoncorretto_23-alpine3.17-jdk/Dockerfile
similarity index 87%
copy from amazoncorretto_17-alpine3.17-jdk/Dockerfile
copy to amazoncorretto_23-alpine3.17-jdk/Dockerfile
index 6a2775e..4fdf82b 100644
--- a/amazoncorretto_17-alpine3.17-jdk/Dockerfile
+++ b/amazoncorretto_23-alpine3.17-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.17
 
-ARG version=17.0.12.7.1
+ARG version=23.0.0.37.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
@@ -12,8 +12,8 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
     SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
     echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
     echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-17=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip
+    apk add --no-cache amazon-corretto-23=$version-r0 && \
+    rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip
 
 
 ENV LANG C.UTF-8
diff --git a/amazoncorretto_11-alpine3.18-jdk/Dockerfile b/amazoncorretto_23-alpine3.18-jdk/Dockerfile
similarity index 87%
copy from amazoncorretto_11-alpine3.18-jdk/Dockerfile
copy to amazoncorretto_23-alpine3.18-jdk/Dockerfile
index 6ed1582..786f19a 100644
--- a/amazoncorretto_11-alpine3.18-jdk/Dockerfile
+++ b/amazoncorretto_23-alpine3.18-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.18
 
-ARG version=11.0.24.8.1
+ARG version=23.0.0.37.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
@@ -12,8 +12,8 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
     SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
     echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
     echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-11=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip
+    apk add --no-cache amazon-corretto-23=$version-r0 && \
+    rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip
 
 
 ENV LANG C.UTF-8
diff --git a/amazoncorretto_17-alpine3.19-jdk/Dockerfile b/amazoncorretto_23-alpine3.19-jdk/Dockerfile
similarity index 87%
copy from amazoncorretto_17-alpine3.19-jdk/Dockerfile
copy to amazoncorretto_23-alpine3.19-jdk/Dockerfile
index 2c77501..641c053 100644
--- a/amazoncorretto_17-alpine3.19-jdk/Dockerfile
+++ b/amazoncorretto_23-alpine3.19-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-ARG version=17.0.12.7.1
+ARG version=23.0.0.37.1
 
 # Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
 # The Corretto team will update this file but you may see a few days' delay.
@@ -12,8 +12,8 @@ RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads
     SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \
     echo "${SHA_SUM}  /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \
     echo "https://apk.corretto.aws" >> /etc/apk/repositories && \
-    apk add --no-cache amazon-corretto-17=$version-r0 && \
-    rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip
+    apk add --no-cache amazon-corretto-23=$version-r0 && \
+    rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip
 
 
 ENV LANG C.UTF-8
diff --git a/amazoncorretto_21.0.4-al2023-headful/Dockerfile b/amazoncorretto_23-headful/Dockerfile
similarity index 74%
copy from amazoncorretto_21.0.4-al2023-headful/Dockerfile
copy to amazoncorretto_23-headful/Dockerfile
index e2b0012..3c0715d 100644
--- a/amazoncorretto_21.0.4-al2023-headful/Dockerfile
+++ b/amazoncorretto_23-headful/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=21.0.4.7-1
+ARG version=23.0.0.37-1
 ARG package_version=1
 
 RUN set -eux \
@@ -8,17 +8,17 @@ RUN set -eux \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-21-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-23-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-23-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-23-amazon-corretto.$(uname -m)/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
 
 ENV LANG C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-21-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-23-amazon-corretto
diff --git a/amazoncorretto_22-headless/Dockerfile b/amazoncorretto_23-headless/Dockerfile
similarity index 79%
copy from amazoncorretto_22-headless/Dockerfile
copy to amazoncorretto_23-headless/Dockerfile
index 89bb538..1e9afa7 100644
--- a/amazoncorretto_22-headless/Dockerfile
+++ b/amazoncorretto_23-headless/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=22.0.2.9-1
+ARG version=23.0.0.37-1
 ARG package_version=1
 
 RUN set -eux \
@@ -8,17 +8,17 @@ RUN set -eux \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-22-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-23-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-22-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-23-amazon-corretto.$(uname -m)/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
 
 ENV LANG C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-23-amazon-corretto
diff --git a/amazoncorretto_22-jdk/Dockerfile b/amazoncorretto_23-jdk/Dockerfile
similarity index 67%
copy from amazoncorretto_22-jdk/Dockerfile
copy to amazoncorretto_23-jdk/Dockerfile
index c2addc4..df1587c 100644
--- a/amazoncorretto_22-jdk/Dockerfile
+++ b/amazoncorretto_23-jdk/Dockerfile
@@ -1,6 +1,6 @@
 FROM amazonlinux:2023
 
-ARG version=22.0.2.9-1
+ARG version=23.0.0.37-1
 ARG package_version=1
 
 RUN set -eux \
@@ -8,17 +8,17 @@ RUN set -eux \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-22-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-22-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-23-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-23-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-23-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-23-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-22-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-23-amazon-corretto.$(uname -m)/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
 
 ENV LANG C.UTF-8
-ENV JAVA_HOME=/usr/lib/jvm/java-22-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-23-amazon-corretto

Relevant Maintainers:

@yosifkit
Copy link
Member

22 is now EOL as well, right? (and thus should be removed?) 👀

As a reminder, removing tags here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build servers), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)

@tianon tianon merged commit 7789531 into docker-library:master Sep 20, 2024
60 checks passed
@Rudometov
Copy link
Contributor

Corretto 22 is supported until October, though I wouldn't expect updates there

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yosifkit yosifkit yosifkit approved these changes

Assignees
No one assigned
Labels
library/amazoncorretto
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chadrako @yosifkit @Rudometov @tianon