From 6da507f6342423e06d0cff299f97c389e7464416 Mon Sep 17 00:00:00 2001 From: Min Choi Date: Tue, 10 Dec 2024 22:27:49 +0000 Subject: [PATCH] Remove Alpine 3.17 EOL, add 3.21 support later --- .github/workflows/verify-images.yml | 2 +- 11/jdk/alpine/3.17/Dockerfile | 22 ---------------------- 17/jdk/alpine/3.17/Dockerfile | 22 ---------------------- 21/jdk/alpine/3.17/Dockerfile | 22 ---------------------- 23/jdk/alpine/3.17/Dockerfile | 22 ---------------------- 8/jdk/alpine/3.17/Dockerfile | 22 ---------------------- 8/jre/alpine/3.17/Dockerfile | 21 --------------------- bin/apply-template.py | 2 +- bin/tag-generator.py | 4 ++-- 9 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 11/jdk/alpine/3.17/Dockerfile delete mode 100644 17/jdk/alpine/3.17/Dockerfile delete mode 100644 21/jdk/alpine/3.17/Dockerfile delete mode 100644 23/jdk/alpine/3.17/Dockerfile delete mode 100644 8/jdk/alpine/3.17/Dockerfile delete mode 100644 8/jre/alpine/3.17/Dockerfile diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml index 31f1488..7481835 100644 --- a/.github/workflows/verify-images.yml +++ b/.github/workflows/verify-images.yml @@ -100,7 +100,7 @@ jobs: fail-fast: false matrix: version: [ 8, 11, 17, 21, 23 ] - os_version: ["3.17", "3.18", "3.19", "3.20"] + os_version: ["3.18", "3.19", "3.20"] steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/11/jdk/alpine/3.17/Dockerfile b/11/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index 7b72910..0000000 --- a/11/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=11.0.25.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-11=$version-r0 && \ - rm -rf /usr/lib/jvm/java-11-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/17/jdk/alpine/3.17/Dockerfile b/17/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index 38c0b5e..0000000 --- a/17/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=17.0.13.11.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-17=$version-r0 && \ - rm -rf /usr/lib/jvm/java-17-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/21/jdk/alpine/3.17/Dockerfile b/21/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index 9997f77..0000000 --- a/21/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=21.0.5.11.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-21=$version-r0 && \ - rm -rf /usr/lib/jvm/java-21-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/23/jdk/alpine/3.17/Dockerfile b/23/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index b10f190..0000000 --- a/23/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=23.0.1.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-23=$version-r0 && \ - rm -rf /usr/lib/jvm/java-23-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/8/jdk/alpine/3.17/Dockerfile b/8/jdk/alpine/3.17/Dockerfile deleted file mode 100644 index 7017f32..0000000 --- a/8/jdk/alpine/3.17/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.17 - -ARG version=8.432.06.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-8=$version-r0 && \ - rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/8/jre/alpine/3.17/Dockerfile b/8/jre/alpine/3.17/Dockerfile deleted file mode 100644 index 1ad430b..0000000 --- a/8/jre/alpine/3.17/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM alpine:3.17 - -ARG version=8.432.06.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. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-8-jre=$version-r0 && \ - rm -rf /usr/lib/jvm/java-8-amazon-corretto/lib/src.zip - - -ENV LANG=C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm/jre diff --git a/bin/apply-template.py b/bin/apply-template.py index d87852a..1b9f2fb 100755 --- a/bin/apply-template.py +++ b/bin/apply-template.py @@ -13,7 +13,7 @@ def process_template_files(major_version, version, platform): input_parameter['MAJOR_VERSION'] = major_version if platform == 'alpine': # Update .github/workflows/verify-images.yml as well when alpine versions changes - os_versions = ['3.17', '3.18', '3.19', '3.20'] + os_versions = ['3.18', '3.19', '3.20'] try: shutil.rmtree(f"{major_version}/jdk/{platform}") shutil.rmtree(f"{major_version}/jre/{platform}") diff --git a/bin/tag-generator.py b/bin/tag-generator.py index e9e19c6..c7e3cd2 100755 --- a/bin/tag-generator.py +++ b/bin/tag-generator.py @@ -1,7 +1,7 @@ import json -DEFAULT_ALPINE_VERSION = '3.20' -ALPINE_VERSIONS = ['3.17', '3.18', '3.19', '3.20'] +DEFAULT_ALPINE_VERSION = '3.21' +ALPINE_VERSIONS = ['3.18', '3.19', '3.20'] def generate_tags(key, version): update = version.split('.')[1] if (key == '8') else version.split('.')[2]