2023 q4 (#184)

* Update for 2023 q4 * Deprecate 20 * Update README to remove out of date risk
corretto · Oct 18, 2023 · 0e2e85a · 0e2e85a · github-actions · Oct 18, 2023
1 parent 222e2a9
commit 0e2e85a
Show file tree

Hide file tree

Showing 68 changed files with 59 additions and 442 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/20/jdk/al2-generic/Dockerfile b/20/jdk/al2-generic/Dockerfile
diff --git a/20/jdk/al2023-generic/Dockerfile b/20/jdk/al2023-generic/Dockerfile
diff --git a/20/jdk/alpine/3.15/Dockerfile b/20/jdk/alpine/3.15/Dockerfile
diff --git a/20/jdk/alpine/3.16/Dockerfile b/20/jdk/alpine/3.16/Dockerfile
diff --git a/20/jdk/alpine/3.17/Dockerfile b/20/jdk/alpine/3.17/Dockerfile