From fce3a1871b706a982707129facc46004be1faa11 Mon Sep 17 00:00:00 2001 From: Rui Li Date: Wed, 18 Oct 2023 16:34:58 +0000 Subject: [PATCH 1/3] Update for 2023 q4 --- 11/headful/al2023/Dockerfile | 2 +- 11/headless/al2/Dockerfile | 2 +- 11/headless/al2023/Dockerfile | 2 +- 11/jdk/al2-generic/Dockerfile | 2 +- 11/jdk/al2/Dockerfile | 2 +- 11/jdk/al2023/Dockerfile | 2 +- 11/jdk/alpine/3.15/Dockerfile | 2 +- 11/jdk/alpine/3.16/Dockerfile | 2 +- 11/jdk/alpine/3.17/Dockerfile | 2 +- 11/jdk/alpine/3.18/Dockerfile | 2 +- 11/jdk/debian/Dockerfile | 2 +- 17/headful/al2/Dockerfile | 2 +- 17/headful/al2023/Dockerfile | 2 +- 17/headless/al2/Dockerfile | 2 +- 17/headless/al2023/Dockerfile | 2 +- 17/jdk/al2-generic/Dockerfile | 2 +- 17/jdk/al2/Dockerfile | 2 +- 17/jdk/al2023/Dockerfile | 2 +- 17/jdk/alpine/3.15/Dockerfile | 2 +- 17/jdk/alpine/3.16/Dockerfile | 2 +- 17/jdk/alpine/3.17/Dockerfile | 2 +- 17/jdk/alpine/3.18/Dockerfile | 2 +- 17/jdk/debian/Dockerfile | 2 +- 17/slim/al2/Dockerfile | 2 +- 17/slim/alpine/Dockerfile | 2 +- 17/slim/debian/Dockerfile | 2 +- 21/headful/al2023/Dockerfile | 2 +- 21/headless/al2023/Dockerfile | 2 +- 21/jdk/al2-generic/Dockerfile | 2 +- 21/jdk/al2023/Dockerfile | 2 +- 21/jdk/alpine/3.15/Dockerfile | 2 +- 21/jdk/alpine/3.16/Dockerfile | 2 +- 21/jdk/alpine/3.17/Dockerfile | 2 +- 21/jdk/alpine/3.18/Dockerfile | 2 +- 21/jdk/debian/Dockerfile | 2 +- 21/slim/al2/Dockerfile | 2 +- 21/slim/alpine/Dockerfile | 2 +- 21/slim/debian/Dockerfile | 2 +- 8/jdk/al2-generic/Dockerfile | 2 +- 8/jdk/al2/Dockerfile | 2 +- 8/jdk/al2023/Dockerfile | 2 +- 8/jdk/alpine/3.15/Dockerfile | 2 +- 8/jdk/alpine/3.16/Dockerfile | 2 +- 8/jdk/alpine/3.17/Dockerfile | 2 +- 8/jdk/alpine/3.18/Dockerfile | 2 +- 8/jdk/debian/Dockerfile | 2 +- 8/jre/al2/Dockerfile | 2 +- 8/jre/al2023/Dockerfile | 2 +- 8/jre/alpine/3.15/Dockerfile | 2 +- 8/jre/alpine/3.16/Dockerfile | 2 +- 8/jre/alpine/3.17/Dockerfile | 2 +- 8/jre/alpine/3.18/Dockerfile | 2 +- README.md | 2 +- versions.json | 8 ++++---- 54 files changed, 57 insertions(+), 57 deletions(-) diff --git a/11/headful/al2023/Dockerfile b/11/headful/al2023/Dockerfile index d55c3d8..8159a12 100644 --- a/11/headful/al2023/Dockerfile +++ b/11/headful/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 RUN set -eux \ && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \ && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \ diff --git a/11/headless/al2/Dockerfile b/11/headless/al2/Dockerfile index 42c27bf..3d639a5 100644 --- a/11/headless/al2/Dockerfile +++ b/11/headless/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.') \ diff --git a/11/headless/al2023/Dockerfile b/11/headless/al2023/Dockerfile index ac47f51..053e3ba 100644 --- a/11/headless/al2023/Dockerfile +++ b/11/headless/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 RUN set -eux \ && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \ && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \ diff --git a/11/jdk/al2-generic/Dockerfile b/11/jdk/al2-generic/Dockerfile index 6ae08e4..73693fb 100644 --- a/11/jdk/al2-generic/Dockerfile +++ b/11/jdk/al2-generic/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/11/jdk/al2/Dockerfile b/11/jdk/al2/Dockerfile index 1250d8f..3eedacd 100644 --- a/11/jdk/al2/Dockerfile +++ b/11/jdk/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.') \ diff --git a/11/jdk/al2023/Dockerfile b/11/jdk/al2023/Dockerfile index 4a79633..7558877 100644 --- a/11/jdk/al2023/Dockerfile +++ b/11/jdk/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 RUN set -eux \ && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \ diff --git a/11/jdk/alpine/3.15/Dockerfile b/11/jdk/alpine/3.15/Dockerfile index 81f2081..37808ec 100644 --- a/11/jdk/alpine/3.15/Dockerfile +++ b/11/jdk/alpine/3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ARG version=11.0.20.9.1 +ARG version=11.0.21.9.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. diff --git a/11/jdk/alpine/3.16/Dockerfile b/11/jdk/alpine/3.16/Dockerfile index 0072488..688af82 100644 --- a/11/jdk/alpine/3.16/Dockerfile +++ b/11/jdk/alpine/3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ARG version=11.0.20.9.1 +ARG version=11.0.21.9.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. diff --git a/11/jdk/alpine/3.17/Dockerfile b/11/jdk/alpine/3.17/Dockerfile index e9bde5e..487f63d 100644 --- a/11/jdk/alpine/3.17/Dockerfile +++ b/11/jdk/alpine/3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=11.0.20.9.1 +ARG version=11.0.21.9.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. diff --git a/11/jdk/alpine/3.18/Dockerfile b/11/jdk/alpine/3.18/Dockerfile index 0d6034c..8cda477 100644 --- a/11/jdk/alpine/3.18/Dockerfile +++ b/11/jdk/alpine/3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ARG version=11.0.20.9.1 +ARG version=11.0.21.9.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. diff --git a/11/jdk/debian/Dockerfile b/11/jdk/debian/Dockerfile index 8b3f46d..bcb8d39 100644 --- a/11/jdk/debian/Dockerfile +++ b/11/jdk/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=11.0.20.9-1 +ARG version=11.0.21.9-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/17/headful/al2/Dockerfile b/17/headful/al2/Dockerfile index 06636bb..9050574 100644 --- a/17/headful/al2/Dockerfile +++ b/17/headful/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.') \ diff --git a/17/headful/al2023/Dockerfile b/17/headful/al2023/Dockerfile index e204888..af6f6ad 100644 --- a/17/headful/al2023/Dockerfile +++ b/17/headful/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 ARG package_version=1 RUN set -eux \ diff --git a/17/headless/al2/Dockerfile b/17/headless/al2/Dockerfile index 292fd00..8af281b 100644 --- a/17/headless/al2/Dockerfile +++ b/17/headless/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.') \ diff --git a/17/headless/al2023/Dockerfile b/17/headless/al2023/Dockerfile index 1ec798a..3163041 100644 --- a/17/headless/al2023/Dockerfile +++ b/17/headless/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 ARG package_version=1 RUN set -eux \ diff --git a/17/jdk/al2-generic/Dockerfile b/17/jdk/al2-generic/Dockerfile index a629a5c..41e83b9 100644 --- a/17/jdk/al2-generic/Dockerfile +++ b/17/jdk/al2-generic/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/17/jdk/al2/Dockerfile b/17/jdk/al2/Dockerfile index f58c874..a48f6e0 100644 --- a/17/jdk/al2/Dockerfile +++ b/17/jdk/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.') \ diff --git a/17/jdk/al2023/Dockerfile b/17/jdk/al2023/Dockerfile index 0db0365..c1731ac 100644 --- a/17/jdk/al2023/Dockerfile +++ b/17/jdk/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 ARG package_version=1 RUN set -eux \ diff --git a/17/jdk/alpine/3.15/Dockerfile b/17/jdk/alpine/3.15/Dockerfile index 79075bb..e4f8375 100644 --- a/17/jdk/alpine/3.15/Dockerfile +++ b/17/jdk/alpine/3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ARG version=17.0.8.8.1 +ARG version=17.0.9.8.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. diff --git a/17/jdk/alpine/3.16/Dockerfile b/17/jdk/alpine/3.16/Dockerfile index 5daf2c3..7976ef1 100644 --- a/17/jdk/alpine/3.16/Dockerfile +++ b/17/jdk/alpine/3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ARG version=17.0.8.8.1 +ARG version=17.0.9.8.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. diff --git a/17/jdk/alpine/3.17/Dockerfile b/17/jdk/alpine/3.17/Dockerfile index 4366c0f..6238d7f 100644 --- a/17/jdk/alpine/3.17/Dockerfile +++ b/17/jdk/alpine/3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=17.0.8.8.1 +ARG version=17.0.9.8.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. diff --git a/17/jdk/alpine/3.18/Dockerfile b/17/jdk/alpine/3.18/Dockerfile index d2ffb20..fca4f6c 100644 --- a/17/jdk/alpine/3.18/Dockerfile +++ b/17/jdk/alpine/3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ARG version=17.0.8.8.1 +ARG version=17.0.9.8.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. diff --git a/17/jdk/debian/Dockerfile b/17/jdk/debian/Dockerfile index 6acf64e..c691a13 100644 --- a/17/jdk/debian/Dockerfile +++ b/17/jdk/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/17/slim/al2/Dockerfile b/17/slim/al2/Dockerfile index f878850..a62bcdb 100644 --- a/17/slim/al2/Dockerfile +++ b/17/slim/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/17/slim/alpine/Dockerfile b/17/slim/alpine/Dockerfile index e12c947..499787f 100644 --- a/17/slim/alpine/Dockerfile +++ b/17/slim/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=17.0.8.8.1 +ARG version=17.0.9.8.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. diff --git a/17/slim/debian/Dockerfile b/17/slim/debian/Dockerfile index 2d46887..0f2a17e 100644 --- a/17/slim/debian/Dockerfile +++ b/17/slim/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=17.0.8.8-1 +ARG version=17.0.9.8-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/21/headful/al2023/Dockerfile b/21/headful/al2023/Dockerfile index 69bddf9..8243ff9 100644 --- a/21/headful/al2023/Dockerfile +++ b/21/headful/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 ARG package_version=1 RUN set -eux \ diff --git a/21/headless/al2023/Dockerfile b/21/headless/al2023/Dockerfile index d2315ea..bdd4ce1 100644 --- a/21/headless/al2023/Dockerfile +++ b/21/headless/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 ARG package_version=1 RUN set -eux \ diff --git a/21/jdk/al2-generic/Dockerfile b/21/jdk/al2-generic/Dockerfile index 36894a5..e4f47c9 100644 --- a/21/jdk/al2-generic/Dockerfile +++ b/21/jdk/al2-generic/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/21/jdk/al2023/Dockerfile b/21/jdk/al2023/Dockerfile index c3cb0e1..aa923aa 100644 --- a/21/jdk/al2023/Dockerfile +++ b/21/jdk/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 ARG package_version=1 RUN set -eux \ diff --git a/21/jdk/alpine/3.15/Dockerfile b/21/jdk/alpine/3.15/Dockerfile index bd66c76..09609af 100644 --- a/21/jdk/alpine/3.15/Dockerfile +++ b/21/jdk/alpine/3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ARG version=21.0.0.35.1 +ARG version=21.0.1.12.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. diff --git a/21/jdk/alpine/3.16/Dockerfile b/21/jdk/alpine/3.16/Dockerfile index 814a34e..c0b2ef2 100644 --- a/21/jdk/alpine/3.16/Dockerfile +++ b/21/jdk/alpine/3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ARG version=21.0.0.35.1 +ARG version=21.0.1.12.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. diff --git a/21/jdk/alpine/3.17/Dockerfile b/21/jdk/alpine/3.17/Dockerfile index b945f32..87f74a5 100644 --- a/21/jdk/alpine/3.17/Dockerfile +++ b/21/jdk/alpine/3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=21.0.0.35.1 +ARG version=21.0.1.12.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. diff --git a/21/jdk/alpine/3.18/Dockerfile b/21/jdk/alpine/3.18/Dockerfile index cf8aec7..f23557b 100644 --- a/21/jdk/alpine/3.18/Dockerfile +++ b/21/jdk/alpine/3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ARG version=21.0.0.35.1 +ARG version=21.0.1.12.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. diff --git a/21/jdk/debian/Dockerfile b/21/jdk/debian/Dockerfile index 477850c..ea159b2 100644 --- a/21/jdk/debian/Dockerfile +++ b/21/jdk/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/21/slim/al2/Dockerfile b/21/slim/al2/Dockerfile index 2686525..eb12dff 100644 --- a/21/slim/al2/Dockerfile +++ b/21/slim/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/21/slim/alpine/Dockerfile b/21/slim/alpine/Dockerfile index b068a99..3ff53db 100644 --- a/21/slim/alpine/Dockerfile +++ b/21/slim/alpine/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=21.0.0.35.1 +ARG version=21.0.1.12.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. diff --git a/21/slim/debian/Dockerfile b/21/slim/debian/Dockerfile index 1b81f6d..49a4dcd 100644 --- a/21/slim/debian/Dockerfile +++ b/21/slim/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=21.0.0.35-1 +ARG version=21.0.1.12-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/8/jdk/al2-generic/Dockerfile b/8/jdk/al2-generic/Dockerfile index 7f0b763..b5d6a8d 100644 --- a/8/jdk/al2-generic/Dockerfile +++ b/8/jdk/al2-generic/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=1.8.0_382.b05-1 +ARG version=1.8.0_392.b08-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/8/jdk/al2/Dockerfile b/8/jdk/al2/Dockerfile index dd0dc38..4055ac7 100644 --- a/8/jdk/al2/Dockerfile +++ b/8/jdk/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=1.8.0_382.b05-1 +ARG version=1.8.0_392.b08-1 RUN set -eux \ diff --git a/8/jdk/al2023/Dockerfile b/8/jdk/al2023/Dockerfile index 05e9a7e..234e672 100644 --- a/8/jdk/al2023/Dockerfile +++ b/8/jdk/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=1.8.0_382.b05-1 +ARG version=1.8.0_392.b08-1 RUN set -eux \ diff --git a/8/jdk/alpine/3.15/Dockerfile b/8/jdk/alpine/3.15/Dockerfile index c76e619..099bee2 100644 --- a/8/jdk/alpine/3.15/Dockerfile +++ b/8/jdk/alpine/3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jdk/alpine/3.16/Dockerfile b/8/jdk/alpine/3.16/Dockerfile index c304666..e087838 100644 --- a/8/jdk/alpine/3.16/Dockerfile +++ b/8/jdk/alpine/3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jdk/alpine/3.17/Dockerfile b/8/jdk/alpine/3.17/Dockerfile index ff00f7c..074dbd3 100644 --- a/8/jdk/alpine/3.17/Dockerfile +++ b/8/jdk/alpine/3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jdk/alpine/3.18/Dockerfile b/8/jdk/alpine/3.18/Dockerfile index 88a00c3..5d27ebb 100644 --- a/8/jdk/alpine/3.18/Dockerfile +++ b/8/jdk/alpine/3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jdk/debian/Dockerfile b/8/jdk/debian/Dockerfile index 298ed78..30eb119 100644 --- a/8/jdk/debian/Dockerfile +++ b/8/jdk/debian/Dockerfile @@ -1,6 +1,6 @@ FROM debian:buster-slim -ARG version=8.382.05-1 +ARG version=8.392.08-1 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management diff --git a/8/jre/al2/Dockerfile b/8/jre/al2/Dockerfile index 2d9b988..13d065b 100644 --- a/8/jre/al2/Dockerfile +++ b/8/jre/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=1.8.0_382.b05-1 +ARG version=1.8.0_392.b08-1 RUN set -eux \ diff --git a/8/jre/al2023/Dockerfile b/8/jre/al2023/Dockerfile index f8cd381..9e23ab8 100644 --- a/8/jre/al2023/Dockerfile +++ b/8/jre/al2023/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2023 -ARG version=1.8.0_382.b05-1 +ARG version=1.8.0_392.b08-1 RUN set -eux \ && export resouce_version=$(echo $version | tr '-' '.' | tr '_' '.'| tr -d "b" | awk -F. '{print $2"."$4"."$5"."$6}') \ diff --git a/8/jre/alpine/3.15/Dockerfile b/8/jre/alpine/3.15/Dockerfile index 0ab4275..cad49fb 100644 --- a/8/jre/alpine/3.15/Dockerfile +++ b/8/jre/alpine/3.15/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jre/alpine/3.16/Dockerfile b/8/jre/alpine/3.16/Dockerfile index bece64f..666c169 100644 --- a/8/jre/alpine/3.16/Dockerfile +++ b/8/jre/alpine/3.16/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jre/alpine/3.17/Dockerfile b/8/jre/alpine/3.17/Dockerfile index adbba31..c59180f 100644 --- a/8/jre/alpine/3.17/Dockerfile +++ b/8/jre/alpine/3.17/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/8/jre/alpine/3.18/Dockerfile b/8/jre/alpine/3.18/Dockerfile index 65f9946..e564f73 100644 --- a/8/jre/alpine/3.18/Dockerfile +++ b/8/jre/alpine/3.18/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.18 -ARG version=8.382.05.1 +ARG version=8.392.08.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. diff --git a/README.md b/README.md index 9afb142..4ab8bd1 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ AWS security directly. :warning: If you are using a Corretto Docker image with an AL2 guest, then Amazon’s ECS scanning function can result in a [ALAS2-2021-1731 notification](https://alas.aws.amazon.com/AL2/ALAS-2021-1731.html). However, there is no reason to update the Corretto application within Docker. You can safely ignore this ALAS. Once the next Corretto quarterly release is posted, currently scheduled for January 19, 2022, the alarm condition will be satisfied. This notice only affects the following Corretto Docker images with AL2 in the Docker ECR: -* [11, 11.0.20, 11.0.20-al2, 11-al2-jdk, 11-al2-full](https://hub.docker.com/_/amazoncorretto) +* [11, 11.0.21, 11.0.21-al2, 11-al2-jdk, 11-al2-full](https://hub.docker.com/_/amazoncorretto) * [17, 17-al2-jdk, 17-al2-full](https://hub.docker.com/_/amazoncorretto) --- diff --git a/versions.json b/versions.json index 2baa42c..af8e1d2 100644 --- a/versions.json +++ b/versions.json @@ -1,8 +1,8 @@ { - "8" : "8.382.05.1", - "11" : "11.0.20.9.1", - "17" : "17.0.8.8.1", + "8" : "8.392.08.1", + "11" : "11.0.21.9.1", + "17" : "17.0.9.8.1", "20" : "20.0.2.10.1", - "21" : "21.0.0.35.1" + "21" : "21.0.1.12.1" } From 7cffe17c56644087dd24fe2a6569abc247598438 Mon Sep 17 00:00:00 2001 From: Rui Li Date: Wed, 18 Oct 2023 16:40:59 +0000 Subject: [PATCH 2/3] Deprecate 20 --- .github/workflows/verify-images.yml | 21 ++------- 20/jdk/al2-generic/Dockerfile | 32 ------------- 20/jdk/al2023-generic/Dockerfile | 30 ------------- 20/jdk/alpine/3.15/Dockerfile | 22 --------- 20/jdk/alpine/3.16/Dockerfile | 22 --------- 20/jdk/alpine/3.17/Dockerfile | 22 --------- 20/jdk/alpine/3.18/Dockerfile | 22 --------- 20/jdk/debian/Dockerfile | 26 ----------- 20/slim/al2/Dockerfile | 67 ---------------------------- 20/slim/alpine/Dockerfile | 29 ------------ 20/slim/debian/Dockerfile | 37 --------------- bin/update-dockerfiles.sh | 6 --- test/test-image-corretto20-jdk.yaml | 22 --------- test/test-image-corretto20-slim.yaml | 22 --------- versions.json | 1 - 15 files changed, 3 insertions(+), 378 deletions(-) delete mode 100644 20/jdk/al2-generic/Dockerfile delete mode 100644 20/jdk/al2023-generic/Dockerfile delete mode 100644 20/jdk/alpine/3.15/Dockerfile delete mode 100644 20/jdk/alpine/3.16/Dockerfile delete mode 100644 20/jdk/alpine/3.17/Dockerfile delete mode 100644 20/jdk/alpine/3.18/Dockerfile delete mode 100644 20/jdk/debian/Dockerfile delete mode 100644 20/slim/al2/Dockerfile delete mode 100644 20/slim/alpine/Dockerfile delete mode 100644 20/slim/debian/Dockerfile delete mode 100644 test/test-image-corretto20-jdk.yaml delete mode 100644 test/test-image-corretto20-slim.yaml diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml index 6995e3e..205abfc 100644 --- a/.github/workflows/verify-images.yml +++ b/.github/workflows/verify-images.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ 8, 11, 17, 20, 21 ] + version: [ 8, 11, 17, 21 ] package: [ jdk ] platform: [ al2-generic, debian ] steps: @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - version: [ 17, 20, 21 ] + version: [ 17, 21 ] package: [ slim ] platform: [ al2, alpine, debian ] steps: @@ -63,28 +63,13 @@ jobs: - name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }} run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }} - verify-corretto-FR-on-al2023: - name: Verify Corretto FR Images on AL2023 - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - version: [ 20 ] - package: [ jdk ] - platform: [ al2023-generic ] - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }} - run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }} - verify-corretto-on-alpine: name: Verify Corretto JDK Images on Alpine runs-on: ubuntu-latest strategy: fail-fast: false matrix: - version: [ 8, 11, 17, 20, 21 ] + version: [ 8, 11, 17, 21 ] os_version: ["3.15", "3.16", "3.17", "3.18"] steps: - name: Checkout code diff --git a/20/jdk/al2-generic/Dockerfile b/20/jdk/al2-generic/Dockerfile deleted file mode 100644 index 68455d8..0000000 --- a/20/jdk/al2-generic/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM amazonlinux:2 - -ARG version=20.0.2.10-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation -# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757 -# PR = https://github.com/docker-library/official-images/pull/7459 -RUN set -eux \ - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \ - && gpg --batch --import corretto.key \ - && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \ - && rpm --import corretto.key \ - && rm -r "$GNUPGHOME" corretto.key \ - && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \ - && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \ - && echo "priority=9" >> /etc/yum.repos.d/corretto.repo \ - && yum install -y java-20-amazon-corretto-devel-$version \ - && (find /usr/lib/jvm/java-20-amazon-corretto -name src.zip -delete || true) \ - && yum install -y fontconfig \ - && yum clean all - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-20-amazon-corretto diff --git a/20/jdk/al2023-generic/Dockerfile b/20/jdk/al2023-generic/Dockerfile deleted file mode 100644 index 38aa551..0000000 --- a/20/jdk/al2023-generic/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM amazonlinux:2023 - -ARG version=20.0.2.10-1 -# In addition to installing the Amazon corretto, we also install -# libs that are needed for jdk to be functional - -# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation -# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757 -# PR = https://github.com/docker-library/official-images/pull/7459 -RUN set -eux \ - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \ - && dnf install gnupg2 -y --allowerasing \ - && dnf install findutils -y \ - && gpg --batch --import corretto.key \ - && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \ - && rpm --import corretto.key \ - && rm -r "$GNUPGHOME" corretto.key \ - && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \ - && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \ - && echo "priority=9" >> /etc/yum.repos.d/corretto.repo \ - && dnf install -y java-20-amazon-corretto-devel-$version \ - && (find /usr/lib/jvm/java-20-amazon-corretto -name src.zip -delete || true) \ - && dnf remove -y findutils \ - && dnf install -y fontconfig freetype libjpeg dejavu-sans-fonts dejavu-serif-fonts dejavu-sans-mono-fonts libjpeg \ - && dnf clean all - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-20-amazon-corretto - diff --git a/20/jdk/alpine/3.15/Dockerfile b/20/jdk/alpine/3.15/Dockerfile deleted file mode 100644 index cc2d5b2..0000000 --- a/20/jdk/alpine/3.15/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.15 - -ARG version=20.0.2.10.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - 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-20=$version-r0 && \ - rm -rf /usr/lib/jvm/java-20-amazon-corretto/lib/src.zip - - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/20/jdk/alpine/3.16/Dockerfile b/20/jdk/alpine/3.16/Dockerfile deleted file mode 100644 index 81c82b0..0000000 --- a/20/jdk/alpine/3.16/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.16 - -ARG version=20.0.2.10.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - 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-20=$version-r0 && \ - rm -rf /usr/lib/jvm/java-20-amazon-corretto/lib/src.zip - - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/20/jdk/alpine/3.17/Dockerfile b/20/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index 4f0ed54..0000000 --- a/20/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=20.0.2.10.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - 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-20=$version-r0 && \ - rm -rf /usr/lib/jvm/java-20-amazon-corretto/lib/src.zip - - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/20/jdk/alpine/3.18/Dockerfile b/20/jdk/alpine/3.18/Dockerfile deleted file mode 100644 index 886baea..0000000 --- a/20/jdk/alpine/3.18/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.18 - -ARG version=20.0.2.10.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - 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-20=$version-r0 && \ - rm -rf /usr/lib/jvm/java-20-amazon-corretto/lib/src.zip - - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/20/jdk/debian/Dockerfile b/20/jdk/debian/Dockerfile deleted file mode 100644 index bb3af2d..0000000 --- a/20/jdk/debian/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM debian:buster-slim - -ARG version=20.0.2.10-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl ca-certificates gnupg software-properties-common fontconfig java-common \ - && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \ - && add-apt-repository 'deb https://apt.corretto.aws stable main' \ - && mkdir -p /usr/share/man/man1 || true \ - && apt-get update \ - && apt-get install -y java-20-amazon-corretto-jdk=1:$version \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - curl gnupg software-properties-common - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-20-amazon-corretto diff --git a/20/slim/al2/Dockerfile b/20/slim/al2/Dockerfile deleted file mode 100644 index 1e9af37..0000000 --- a/20/slim/al2/Dockerfile +++ /dev/null @@ -1,67 +0,0 @@ -FROM amazonlinux:2 - -ARG version=20.0.2.10-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation -# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757 -# PR = https://github.com/docker-library/official-images/pull/7459 -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN set -eux \ - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \ - && gpg --batch --import corretto.key \ - && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \ - && rpm --import corretto.key \ - && rm -r "$GNUPGHOME" corretto.key \ - && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \ - && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \ - && echo "priority=9" >> /etc/yum.repos.d/corretto.repo \ - && yum install -y java-20-amazon-corretto-devel-$version \ - && (find /usr/lib/jvm/java-20-amazon-corretto -name src.zip -delete || true) \ - && yum install -y fontconfig \ - && yum install -y binutils \ - && jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim \ - && yum remove -y binutils java-20-amazon-corretto-devel-$version \ - && mkdir -p /usr/lib/jvm/ \ - && mv /opt/corretto-slim /usr/lib/jvm/java-20-amazon-corretto \ - && alternatives --install /usr/bin/java java /usr/lib/jvm/java-20-amazon-corretto/bin/java $(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - --slave /usr/bin/keytool keytool /usr/lib/jvm/java-20-amazon-corretto/bin/keytool \ - --slave /usr/bin/rmid rmid /usr/lib/jvm/java-20-amazon-corretto/bin/rmid \ - --slave /usr/bin/rmiregistry rmiregistry /usr/lib/jvm/java-20-amazon-corretto/bin/rmiregistry \ - && alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-20-amazon-corretto/bin/javac $(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - --slave /usr/bin/jaotc jaotc /usr/lib/jvm/java-20-amazon-corretto/bin/jaotc \ - --slave /usr/bin/jlink jlink /usr/lib/jvm/java-20-amazon-corretto/bin/jlink \ - --slave /usr/bin/jmod jmod /usr/lib/jvm/java-20-amazon-corretto/bin/jmod \ - --slave /usr/bin/jhsdb jhsdb /usr/lib/jvm/java-20-amazon-corretto/bin/jhsdb \ - --slave /usr/bin/jar jar /usr/lib/jvm/java-20-amazon-corretto/bin/jar \ - --slave /usr/bin/jarsigner jarsigner /usr/lib/jvm/java-20-amazon-corretto/bin/jarsigner \ - --slave /usr/bin/javadoc javadoc /usr/lib/jvm/java-20-amazon-corretto/bin/javadoc \ - --slave /usr/bin/javap javap /usr/lib/jvm/java-20-amazon-corretto/bin/javap \ - --slave /usr/bin/jcmd jcmd /usr/lib/jvm/java-20-amazon-corretto/bin/jcmd \ - --slave /usr/bin/jconsole jconsole /usr/lib/jvm/java-20-amazon-corretto/bin/jconsole \ - --slave /usr/bin/jdb jdb /usr/lib/jvm/java-20-amazon-corretto/bin/jdb \ - --slave /usr/bin/jdeps jdeps /usr/lib/jvm/java-20-amazon-corretto/bin/jdeps \ - --slave /usr/bin/jdeprscan jdeprscan /usr/lib/jvm/java-20-amazon-corretto/bin/jdeprscan \ - --slave /usr/bin/jimage jimage /usr/lib/jvm/java-20-amazon-corretto/bin/jimage \ - --slave /usr/bin/jinfo jinfo /usr/lib/jvm/java-20-amazon-corretto/bin/jinfo \ - --slave /usr/bin/jmap jmap /usr/lib/jvm/java-20-amazon-corretto/bin/jmap \ - --slave /usr/bin/jps jps /usr/lib/jvm/java-20-amazon-corretto/bin/jps \ - --slave /usr/bin/jrunscript jrunscript /usr/lib/jvm/java-20-amazon-corretto/bin/jrunscript \ - --slave /usr/bin/jshell jshell /usr/lib/jvm/java-20-amazon-corretto/bin/jshell \ - --slave /usr/bin/jstack jstack /usr/lib/jvm/java-20-amazon-corretto/bin/jstack \ - --slave /usr/bin/jstat jstat /usr/lib/jvm/java-20-amazon-corretto/bin/jstat \ - --slave /usr/bin/jstatd jstatd /usr/lib/jvm/java-20-amazon-corretto/bin/jstatd \ - && yum clean all - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-20-amazon-corretto diff --git a/20/slim/alpine/Dockerfile b/20/slim/alpine/Dockerfile deleted file mode 100644 index 07f47e6..0000000 --- a/20/slim/alpine/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM alpine:3.17 - -ARG version=20.0.2.10.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. -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - 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-20=$version-r0 binutils && \ - /usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \ - apk del binutils amazon-corretto-20 && \ - mkdir -p /usr/lib/jvm/ && \ - mv /opt/corretto-slim /usr/lib/jvm/java-20-amazon-corretto && \ - ln -sfn /usr/lib/jvm/java-20-amazon-corretto /usr/lib/jvm/default-jvm - - - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/20/slim/debian/Dockerfile b/20/slim/debian/Dockerfile deleted file mode 100644 index 4b50315..0000000 --- a/20/slim/debian/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM debian:buster-slim - -ARG version=20.0.2.10-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN set -ux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl ca-certificates gnupg software-properties-common fontconfig \ - && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \ - && add-apt-repository 'deb https://apt.corretto.aws stable main' \ - && mkdir -p /usr/share/man/man1 \ - && apt-get update \ - && apt-get install -y java-20-amazon-corretto-jdk=1:$version binutils \ - && jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - curl gnupg software-properties-common binutils java-20-amazon-corretto-jdk=1:$version \ - && mkdir -p /usr/lib/jvm \ - && mv /opt/corretto-slim /usr/lib/jvm/java-20-amazon-corretto \ - && jdk_tools="java keytool rmid rmiregistry javac jaotc jlink jmod jhsdb jar jarsigner javadoc javap jcmd jconsole jdb jdeps jdeprscan jimage jinfo jmap jps jrunscript jshell jstack jstat jstatd serialver" \ - && priority=$(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - && for i in ${jdk_tools}; do \ - update-alternatives --install /usr/bin/$i $i /usr/lib/jvm/java-20-amazon-corretto/bin/$i ${priority}; \ - done - - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-20-amazon-corretto diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index 530dc8e..916d964 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -103,7 +103,6 @@ done CORRETTO_8_GENERIC_LINUX=$(cat versions.json | jq -r '.["8"]' ) CORRETTO_11_GENERIC_LINUX=$(cat versions.json | jq -r '.["11"]' ) CORRETTO_17_GENERIC_LINUX=$(cat versions.json | jq -r '.["17"]' ) -CORRETTO_20_GENERIC_LINUX=$(cat versions.json | jq -r '.["20"]' ) CORRETTO_21_GENERIC_LINUX=$(cat versions.json | jq -r '.["21"]' ) if [ ! -z "${CORRETTO_11_GENERIC_LINUX}" ]; then @@ -114,10 +113,6 @@ if [ ! -z "${CORRETTO_17_GENERIC_LINUX}" ]; then update_generic_linux ${CORRETTO_17_GENERIC_LINUX} 17 fi -if [ ! -z "${CORRETTO_20_GENERIC_LINUX}" ]; then - update_generic_linux ${CORRETTO_20_GENERIC_LINUX} 20 -fi - if [ ! -z "${CORRETTO_21_GENERIC_LINUX}" ]; then update_generic_linux ${CORRETTO_21_GENERIC_LINUX} 21 fi @@ -146,5 +141,4 @@ python3 bin/apply-template.py verify_update 8 ${jdk_version} verify_update 11 ${CORRETTO_11_GENERIC_LINUX} verify_update 17 ${CORRETTO_17_GENERIC_LINUX} -verify_update 20 ${CORRETTO_20_GENERIC_LINUX} verify_update 21 ${CORRETTO_21_GENERIC_LINUX} diff --git a/test/test-image-corretto20-jdk.yaml b/test/test-image-corretto20-jdk.yaml deleted file mode 100644 index aa51f23..0000000 --- a/test/test-image-corretto20-jdk.yaml +++ /dev/null @@ -1,22 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: LANG - value: C.UTF-8 - -commandTests: - - name: "java command is registered using alternatives." - command: "java" - args: ["-version"] - expectedError: ["OpenJDK Runtime Environment Corretto-20.*"] - - - name: "javac command is registered using alternatives." - command: "javac" - args: ["-version"] - expectedOutput: ["javac 20*"] - - - name: "JAVA_HOME points to the correct directory." - command: "$JAVA_HOME/bin/java" - args: ["-version"] - expectedError: ["OpenJDK Runtime Environment Corretto-20.*"] diff --git a/test/test-image-corretto20-slim.yaml b/test/test-image-corretto20-slim.yaml deleted file mode 100644 index aa51f23..0000000 --- a/test/test-image-corretto20-slim.yaml +++ /dev/null @@ -1,22 +0,0 @@ -schemaVersion: "2.0.0" - -metadataTest: - envVars: - - key: LANG - value: C.UTF-8 - -commandTests: - - name: "java command is registered using alternatives." - command: "java" - args: ["-version"] - expectedError: ["OpenJDK Runtime Environment Corretto-20.*"] - - - name: "javac command is registered using alternatives." - command: "javac" - args: ["-version"] - expectedOutput: ["javac 20*"] - - - name: "JAVA_HOME points to the correct directory." - command: "$JAVA_HOME/bin/java" - args: ["-version"] - expectedError: ["OpenJDK Runtime Environment Corretto-20.*"] diff --git a/versions.json b/versions.json index af8e1d2..04cfb2b 100644 --- a/versions.json +++ b/versions.json @@ -2,7 +2,6 @@ "8" : "8.392.08.1", "11" : "11.0.21.9.1", "17" : "17.0.9.8.1", - "20" : "20.0.2.10.1", "21" : "21.0.1.12.1" } From 50037671559085e3f238bfe8088d5457f36bc7dd Mon Sep 17 00:00:00 2001 From: Rui Li Date: Wed, 18 Oct 2023 18:31:53 +0000 Subject: [PATCH 3/3] Update README to remove out of date risk --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 4ab8bd1..cf0b858 100644 --- a/README.md +++ b/README.md @@ -46,14 +46,6 @@ AWS security directly. ## Why does security scanner show that a docker image has a CVE? -:warning: If you are using a Corretto Docker image with an AL2 guest, then Amazon’s ECS scanning function can result in a [ALAS2-2021-1731 notification](https://alas.aws.amazon.com/AL2/ALAS-2021-1731.html). However, there is no reason to update the Corretto application within Docker. You can safely ignore this ALAS. Once the next Corretto quarterly release is posted, currently scheduled for January 19, 2022, the alarm condition will be satisfied. -This notice only affects the following Corretto Docker images with AL2 in the Docker ECR: - -* [11, 11.0.21, 11.0.21-al2, 11-al2-jdk, 11-al2-full](https://hub.docker.com/_/amazoncorretto) -* [17, 17-al2-jdk, 17-al2-full](https://hub.docker.com/_/amazoncorretto) - ---- - If a security scanner reports that an amazoncorretto image includes a CVE, the first recommended action is to pull an updated version of this image. If no updated image is available, run the appropriate command to update packages for the platform, ie. run "apk -U upgrade" for Alpine or "yum update -y --security" for AmazonLinux in your Dockerfiles or systems to resolve the issue immediately.