diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml index df07804c..766c05d5 100644 --- a/.github/workflows/verify-images.yml +++ b/.github/workflows/verify-images.yml @@ -70,7 +70,7 @@ jobs: fail-fast: false matrix: version: [ 8, 11, 17, 20 ] - os_version: ["3.14", "3.15", "3.16", "3.17"] + os_version: ["3.15", "3.16", "3.17"] steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/11/jdk/alpine/3.14/Dockerfile b/11/jdk/alpine/3.14/Dockerfile deleted file mode 100644 index 79d2a0e4..00000000 --- a/11/jdk/alpine/3.14/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.14 - -ARG version=11.0.19.7.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 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/17/jdk/alpine/3.14/Dockerfile b/17/jdk/alpine/3.14/Dockerfile deleted file mode 100644 index 21d66eab..00000000 --- a/17/jdk/alpine/3.14/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.14 - -ARG version=17.0.7.7.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 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/20/jdk/alpine/3.14/Dockerfile b/20/jdk/alpine/3.14/Dockerfile deleted file mode 100644 index 485a8c9e..00000000 --- a/20/jdk/alpine/3.14/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.14 - -ARG version=20.0.1.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-20=$version-r0 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/8/jdk/alpine/3.14/Dockerfile b/8/jdk/alpine/3.14/Dockerfile deleted file mode 100644 index 787d1cb6..00000000 --- a/8/jdk/alpine/3.14/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.14 - -ARG version=8.372.07.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 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/8/jre/alpine/3.14/Dockerfile b/8/jre/alpine/3.14/Dockerfile deleted file mode 100644 index 5dcb5369..00000000 --- a/8/jre/alpine/3.14/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM alpine:3.14 - -ARG version=8.372.07.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 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm/jre - - \ No newline at end of file diff --git a/bin/apply-template.py b/bin/apply-template.py index af19ae49..3a53b0b1 100644 --- 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.14', '3.15', '3.16', '3.17'] + os_versions = ['3.15', '3.16', '3.17'] 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 71631edb..1cf55b7b 100644 --- a/bin/tag-generator.py +++ b/bin/tag-generator.py @@ -1,7 +1,7 @@ import json DEFAULT_ALPINE_VERSION = '3.17' -ALPINE_VERSIONS = ['3.14', '3.15', '3.16', '3.17'] +ALPINE_VERSIONS = ['3.15', '3.16', '3.17'] LTS_VERSIONS = [ "8", "11", "17"]