From 229b948cb7a0438c0645561c6d51aa8377c6aed9 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 17:57:20 +0000 Subject: [PATCH 1/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index a7f6107..9cf9da9 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -5,6 +5,8 @@ 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() { echo "usage: update-dockerfiles.sh [--help]" @@ -52,13 +54,15 @@ 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) - ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile + if [[ "${AL2_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; 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} ]]; then + 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 ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headless/al2023/Dockerfile From 5d085ee901b8ac7992b80409c5a3e4c05b5f1dc4 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 17:58:36 +0000 Subject: [PATCH 2/8] Fr release and AL2 supported versions update --- bin/tag-generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/tag-generator.py b/bin/tag-generator.py index a4aa958..7db897a 100755 --- a/bin/tag-generator.py +++ b/bin/tag-generator.py @@ -4,7 +4,7 @@ ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19'] LTS_VERSIONS = [ "8", "11", "17", "21"] -AL2023_GENERIC_VERSIONS = ["20"] +AL2023_GENERIC_VERSIONS = ["22"] def generate_tags(key, version): update = version.split('.')[1] if (key == '8') else version.split('.')[2] From af6dfe56c4581a22f42f70ae33563f3e267c6feb Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:22:24 +0000 Subject: [PATCH 3/8] Fr release and AL2 supported versions update --- bin/tag-generator.py | 5 ----- bin/update-dockerfiles.sh | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/bin/tag-generator.py b/bin/tag-generator.py index 7db897a..3a7a1a2 100755 --- 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 index 9cf9da9..71127c4 100755 --- 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 From c047e12c39ee7320d2b48de987f5a89504da8bd2 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:30:45 +0000 Subject: [PATCH 4/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index 71127c4..8da3ef1 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -4,9 +4,6 @@ SED="sed -i" sed --version 2>/dev/null || SED="sed -i.bkp" -LTS_VERSIONS=("8" "11" "17" "21") -FR_VERSIONS=("22") - usage() { echo "usage: update-dockerfiles.sh [--help]" echo "" @@ -56,12 +53,17 @@ update_generic_linux() { 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 [[ "${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 + 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 [[ -f ./${MAJOR_RELEASE}/headful/al2023-generic/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile + fi + if [[ -f ./${MAJOR_RELEASE}/headless/al2023-generic/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headless/al2023/Dockerfile fi + ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/debian/Dockerfile ADDITIONAL_IMAGES="jdk jre headful headless" From f9079c92e25139178b278e67ab9c57f6e0bd8ead Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:36:04 +0000 Subject: [PATCH 5/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index 8da3ef1..315b3a2 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -53,9 +53,6 @@ update_generic_linux() { 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 [[ -f ./${MAJOR_RELEASE}/headful/al2023-generic/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile fi From 9456a8568289a53be8e4c888e295b3c880298333 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:37:12 +0000 Subject: [PATCH 6/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index 315b3a2..ed393a1 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -53,10 +53,10 @@ update_generic_linux() { 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}/headful/al2023-generic/Dockerfile ]]; then + if [[ -f ./${MAJOR_RELEASE}/headful/al2023/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile fi - if [[ -f ./${MAJOR_RELEASE}/headless/al2023-generic/Dockerfile ]]; then + if [[ -f ./${MAJOR_RELEASE}/headless/al2023/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headless/al2023/Dockerfile fi From 1b504e98ffdff643277535adc08111acc8cdf2ce Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:40:22 +0000 Subject: [PATCH 7/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index ed393a1..929a563 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -53,6 +53,9 @@ update_generic_linux() { 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/Dockerfile ]]; then + ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023/Dockerfile + fi if [[ -f ./${MAJOR_RELEASE}/headful/al2023/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile fi From c06a2549faba432e4ba1baf13c7daa8546e1e995 Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 18:51:41 +0000 Subject: [PATCH 8/8] Fr release and AL2 supported versions update --- bin/update-dockerfiles.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh index 929a563..3c988da 100755 --- a/bin/update-dockerfiles.sh +++ b/bin/update-dockerfiles.sh @@ -78,8 +78,10 @@ update_generic_linux() { ${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*,/${jdk_version},/g" README.md ${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*-al2/${jdk_version}-al2/g" README.md - if [ -d "./${MAJOR_RELEASE}/slim" ]; then + if [[ -f ./${MAJOR_RELEASE}/slim/al2/Dockerfile ]]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/slim/al2/Dockerfile + fi + if [ -d "./${MAJOR_RELEASE}/slim" ]; then ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/slim/debian/Dockerfile ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}.${corretto_version}/g" ./${MAJOR_RELEASE}/slim/alpine/Dockerfile ${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*-slim,/${jdk_version},/g" README.md