Remove 22 (#219)

corretto · Oct 16, 2024 · 043a4ed · 043a4ed · github-actions · Oct 16, 2024
1 parent 95398b2
commit 043a4ed
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 328 deletions.
diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml
@@ -18,13 +18,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-22-plus:
-    name: Verify Corretto 22+ JDK Images
+  verify-corretto-23-plus:
+    name: Verify Corretto 23+ JDK Images
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: [ 22, 23 ]
+        version: [ 23 ]
         package: [ jdk ]
         platform: [ debian ]
     steps:
@@ -48,13 +48,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-slim-22-plus:
-    name: Verify Corretto 22+ Slim Images
+  verify-corretto-slim-23-plus:
+    name: Verify Corretto 23+ Slim Images
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        version: [ 22, 23 ]
+        version: [ 23 ]
         package: [ slim ]
         platform: [ alpine, debian ]
     steps:
@@ -84,7 +84,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 11, 17, 21, 22, 23 ]
+        version: [ 11, 17, 21, 23 ]
         package: [ jdk, headful, headless ]
         platform: [ al2023 ]
     steps:
@@ -99,7 +99,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [ 8, 11, 17, 21, 22, 23 ]
+        version: [ 8, 11, 17, 21, 23 ]
         os_version: ["3.17", "3.18", "3.19", "3.20"]
     steps:
       - name: Checkout code

diff --git a/22/headful/al2023/Dockerfile b/22/headful/al2023/Dockerfile
diff --git a/22/headless/al2023/Dockerfile b/22/headless/al2023/Dockerfile
diff --git a/22/jdk/al2023/Dockerfile b/22/jdk/al2023/Dockerfile
diff --git a/22/jdk/alpine/3.17/Dockerfile b/22/jdk/alpine/3.17/Dockerfile
diff --git a/22/jdk/alpine/3.18/Dockerfile b/22/jdk/alpine/3.18/Dockerfile
diff --git a/22/jdk/alpine/3.19/Dockerfile b/22/jdk/alpine/3.19/Dockerfile
diff --git a/22/jdk/alpine/3.20/Dockerfile b/22/jdk/alpine/3.20/Dockerfile
diff --git a/22/jdk/debian/Dockerfile b/22/jdk/debian/Dockerfile
diff --git a/22/slim/alpine/Dockerfile b/22/slim/alpine/Dockerfile
diff --git a/22/slim/debian/Dockerfile b/22/slim/debian/Dockerfile
diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh
@@ -106,7 +106,6 @@ 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_21_GENERIC_LINUX=$(cat versions.json | jq -r '.["21"]' )
-CORRETTO_22_GENERIC_LINUX=$(cat versions.json | jq -r '.["22"]' )
 CORRETTO_23_GENERIC_LINUX=$(cat versions.json | jq -r '.["23"]' )
 
 if [ ! -z "${CORRETTO_11_GENERIC_LINUX}" ]; then
@@ -121,10 +120,6 @@ if [ ! -z "${CORRETTO_21_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_21_GENERIC_LINUX} 21
 fi
 
-if [ ! -z "${CORRETTO_22_GENERIC_LINUX}" ]; then
-    update_generic_linux ${CORRETTO_22_GENERIC_LINUX} 22
-fi
-
 if [ ! -z "${CORRETTO_23_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_23_GENERIC_LINUX} 23
 fi
@@ -154,5 +149,4 @@ verify_update 8 ${jdk_version}
 verify_update 11 ${CORRETTO_11_GENERIC_LINUX}
 verify_update 17 ${CORRETTO_17_GENERIC_LINUX}
 verify_update 21 ${CORRETTO_21_GENERIC_LINUX}
-verify_update 22 ${CORRETTO_22_GENERIC_LINUX}
 verify_update 23 ${CORRETTO_23_GENERIC_LINUX}
diff --git a/test/test-image-corretto22-jdk.yaml b/test/test-image-corretto22-jdk.yaml
diff --git a/test/test-image-corretto22-jre.yaml b/test/test-image-corretto22-jre.yaml