From 19e98817bffae9775fa91403c1e1ad501bcd55fe Mon Sep 17 00:00:00 2001
From: Jenny Shivayogi <kspeeyu@amazon.com>
Date: Tue, 7 Nov 2023 12:21:35 -0800
Subject: [PATCH] remove support for alpine 3.15(EOL)

---
 .github/workflows/verify-images.yml |  2 +-
 .tags                               | 20 --------------------
 11/jdk/alpine/3.15/Dockerfile       | 22 ----------------------
 17/jdk/alpine/3.15/Dockerfile       | 22 ----------------------
 21/jdk/alpine/3.15/Dockerfile       | 22 ----------------------
 8/jdk/alpine/3.15/Dockerfile        | 22 ----------------------
 8/jre/alpine/3.15/Dockerfile        | 21 ---------------------
 bin/apply-template.py               |  2 +-
 bin/tag-generator.py                |  2 +-
 9 files changed, 3 insertions(+), 132 deletions(-)
 delete mode 100644 11/jdk/alpine/3.15/Dockerfile
 delete mode 100644 17/jdk/alpine/3.15/Dockerfile
 delete mode 100644 21/jdk/alpine/3.15/Dockerfile
 delete mode 100644 8/jdk/alpine/3.15/Dockerfile
 delete mode 100644 8/jre/alpine/3.15/Dockerfile

diff --git a/.github/workflows/verify-images.yml b/.github/workflows/verify-images.yml
index 205abfc..dc8becb 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, 21 ]
-        os_version: ["3.15", "3.16", "3.17", "3.18"]
+        os_version: ["3.16", "3.17", "3.18"]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/.tags b/.tags
index e929890..e221fea 100644
--- a/.tags
+++ b/.tags
@@ -18,14 +18,6 @@ Tags: 8-al2-native-jdk, 8u382-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/al2
 
-Tags: 8-alpine3.15, 8u382-alpine3.15, 8-alpine3.15-full, 8-alpine3.15-jdk
-Architectures: amd64, arm64v8
-Directory: 8/jdk/alpine/3.15
-
-Tags: 8-alpine3.15-jre, 8u382-alpine3.15-jre
-Architectures: amd64, arm64v8
-Directory: 8/jre/alpine/3.15
-
 Tags: 8-alpine3.16, 8u382-alpine3.16, 8-alpine3.16-full, 8-alpine3.16-jdk
 Architectures: amd64, arm64v8
 Directory: 8/jdk/alpine/3.16
@@ -74,10 +66,6 @@ Tags: 11-al2-native-jdk, 11.0.20-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/al2
 
-Tags: 11-alpine3.15, 11.0.20-alpine3.15, 11-alpine3.15-full, 11-alpine3.15-jdk
-Architectures: amd64, arm64v8
-Directory: 11/jdk/alpine/3.15
-
 Tags: 11-alpine3.16, 11.0.20-alpine3.16, 11-alpine3.16-full, 11-alpine3.16-jdk
 Architectures: amd64, arm64v8
 Directory: 11/jdk/alpine/3.16
@@ -118,10 +106,6 @@ Tags: 17-al2-native-jdk, 17.0.8-al2-native-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/al2
 
-Tags: 17-alpine3.15, 17.0.8-alpine3.15, 17-alpine3.15-full, 17-alpine3.15-jdk
-Architectures: amd64, arm64v8
-Directory: 17/jdk/alpine/3.15
-
 Tags: 17-alpine3.16, 17.0.8-alpine3.16, 17-alpine3.16-full, 17-alpine3.16-jdk
 Architectures: amd64, arm64v8
 Directory: 17/jdk/alpine/3.16
@@ -142,10 +126,6 @@ Tags: 20-al2023-generic, 20.0.2-al2023-generic, 20-al2023-generic-jdk
 Architectures: amd64, arm64v8
 Directory: 20/jdk/al2023-generic
 
-Tags: 20-alpine3.15, 20.0.2-alpine3.15, 20-alpine3.15-full, 20-alpine3.15-jdk
-Architectures: amd64, arm64v8
-Directory: 20/jdk/alpine/3.15
-
 Tags: 20-alpine3.16, 20.0.2-alpine3.16, 20-alpine3.16-full, 20-alpine3.16-jdk
 Architectures: amd64, arm64v8
 Directory: 20/jdk/alpine/3.16
diff --git a/11/jdk/alpine/3.15/Dockerfile b/11/jdk/alpine/3.15/Dockerfile
deleted file mode 100644
index 37808ec..0000000
--- a/11/jdk/alpine/3.15/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.15
-
-ARG version=11.0.21.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.15/Dockerfile b/17/jdk/alpine/3.15/Dockerfile
deleted file mode 100644
index e4f8375..0000000
--- a/17/jdk/alpine/3.15/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.15
-
-ARG version=17.0.9.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-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.15/Dockerfile b/21/jdk/alpine/3.15/Dockerfile
deleted file mode 100644
index 09609af..0000000
--- a/21/jdk/alpine/3.15/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.15
-
-ARG version=21.0.1.12.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/8/jdk/alpine/3.15/Dockerfile b/8/jdk/alpine/3.15/Dockerfile
deleted file mode 100644
index 099bee2..0000000
--- a/8/jdk/alpine/3.15/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM alpine:3.15
-
-ARG version=8.392.08.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.15/Dockerfile b/8/jre/alpine/3.15/Dockerfile
deleted file mode 100644
index cad49fb..0000000
--- a/8/jre/alpine/3.15/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-FROM alpine:3.15
-
-ARG version=8.392.08.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 5ffb6af..136ef37 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.15', '3.16', '3.17', '3.18']
+        os_versions = ['3.16', '3.17', '3.18']
     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 87edfd9..1bc0f11 100644
--- a/bin/tag-generator.py
+++ b/bin/tag-generator.py
@@ -1,7 +1,7 @@
 import json
 
 DEFAULT_ALPINE_VERSION = '3.18'
-ALPINE_VERSIONS = ['3.15', '3.16', '3.17', '3.18']
+ALPINE_VERSIONS = ['3.16', '3.17', '3.18']
 
 LTS_VERSIONS = [ "8", "11", "17", "21"]
 AL2023_GENERIC_VERSIONS = ["20"]