From 1abd437d0db2a657927b96cfe63af8817b2cebdc Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Mon, 25 Mar 2024 23:09:05 +0000 Subject: [PATCH 1/2] remove al2 tag for unsupported versions --- bin/tag-generator.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/bin/tag-generator.py b/bin/tag-generator.py index 9195a16..3434226 100755 --- a/bin/tag-generator.py +++ b/bin/tag-generator.py @@ -4,25 +4,23 @@ ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19'] LTS_VERSIONS = [ "8", "11", "17", "21"] -UNSUPPORTED_AL2_VERSIONS = [ "22" ] def generate_tags(key, version): update = version.split('.')[1] if (key == '8') else version.split('.')[2] expanded_version = f"{key}u{update}" if (key == '8') else f"{key}.0.{update}" al2023_tags = [f"{key}-al2023", f"{expanded_version}-al2023" ,f"{key}-al2023-jdk"] al2023_generic_tags = [f"{key}-al2023-generic", f"{expanded_version}-al2023-generic", f"{key}-al2023-generic-jdk"] - if key not in UNSUPPORTED_AL2_VERSIONS: + if int(key) <= 21: al2_tags = [f"{key}", f"{expanded_version}", f"{expanded_version}-al2", f"{key}-al2-full", f"{key}-al2-jdk", f"{key}-al2-generic", f"{expanded_version}-al2-generic", f"{key}-al2-generic-jdk"] + print("Tags: " + ", ".join(al2_tags) + "") + print("Architectures: amd64, arm64v8") + print(f"Directory: {key}/jdk/al2-generic\n") else: al2_tags = [] if key == '8': al2_tags.append('latest') - print("Tags: " + ", ".join(al2_tags) + "") - print("Architectures: amd64, arm64v8") - print(f"Directory: {key}/jdk/al2-generic\n") - if key in LTS_VERSIONS: print("Tags: " + ", ".join(al2023_tags) + "") print("Architectures: amd64, arm64v8") From 5414d05821b3b89257c8c5378f9b8194b209a8ed Mon Sep 17 00:00:00 2001 From: Elif Aslan Date: Tue, 26 Mar 2024 00:07:55 +0000 Subject: [PATCH 2/2] add FR version for al2023 --- bin/tag-generator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/tag-generator.py b/bin/tag-generator.py index 3434226..d04e1ed 100755 --- a/bin/tag-generator.py +++ b/bin/tag-generator.py @@ -4,6 +4,7 @@ ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19'] LTS_VERSIONS = [ "8", "11", "17", "21"] +FR_VERSIONS = [ "22" ] def generate_tags(key, version): update = version.split('.')[1] if (key == '8') else version.split('.')[2] expanded_version = f"{key}u{update}" if (key == '8') else f"{key}.0.{update}" @@ -21,7 +22,7 @@ def generate_tags(key, version): al2_tags.append('latest') - if key in LTS_VERSIONS: + if key in LTS_VERSIONS or key in FR_VERSIONS: print("Tags: " + ", ".join(al2023_tags) + "") print("Architectures: amd64, arm64v8") print(f"Directory: {key}/jdk/al2023\n")