Fr release and AL2 supported versions update

corretto · Mar 25, 2024 · af6dfe5 · af6dfe5
1 parent 5d085ee
commit af6dfe5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/bin/tag-generator.py b/bin/tag-generator.py
@@ -4,7 +4,6 @@
 ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19']
 
 LTS_VERSIONS = [ "8", "11", "17", "21"]
-AL2023_GENERIC_VERSIONS = ["22"]
 
 def generate_tags(key, version):
     update = version.split('.')[1] if (key == '8') else version.split('.')[2]
@@ -38,10 +37,6 @@ def generate_tags(key, version):
             print("Architectures: amd64, arm64v8")
             print(f"Directory: {key}/headful/al2023\n")
 
-    if key in AL2023_GENERIC_VERSIONS:
-        print("Tags: " + ", ".join(al2023_generic_tags) + "")
-        print("Architectures: amd64, arm64v8")
-        print(f"Directory: {key}/jdk/al2023-generic\n")
 
     # For LTS versions with modular AmazonLinux packages we want to tag those images
     native_package_modifier="al2-native-"

diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh
@@ -5,7 +5,6 @@ SED="sed -i"
 sed --version 2>/dev/null || SED="sed -i.bkp"
 
 LTS_VERSIONS=("8" "11" "17" "21")
-AL2_VERSIONS=("8" "11" "17" "21")
 FR_VERSIONS=("22")
 
 usage() {
@@ -54,14 +53,9 @@ update_generic_linux() {
     jdk_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f1-3)
     jdk_build=$(echo ${CORRETTO_VERSION} | cut -d'.' -f4)
     corretto_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f5)
-    if [[ "${AL2_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; then
+    if [[ -f ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile ]]; then
         ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile
     fi
-    if [[ -f ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile ]]
-    then
-        ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile
-    fi
-
     if [[ "${LTS_VERSIONS[*]}" =~ ${MAJOR_RELEASE} || "${FR_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; then
         ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023/Dockerfile
         ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile