Merge pull request corretto#186 from kspeeyu/main

remove support for alpine 3.15(EOL)
jaikanth-arcadia · Nov 8, 2023 · 7b82f91 · 7b82f91
2 parents 137b6ef + 19e9881
commit 7b82f91
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 132 deletions.
diff --git 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
@@ -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
diff --git a/17/jdk/alpine/3.15/Dockerfile b/17/jdk/alpine/3.15/Dockerfile
diff --git a/21/jdk/alpine/3.15/Dockerfile b/21/jdk/alpine/3.15/Dockerfile
diff --git a/8/jdk/alpine/3.15/Dockerfile b/8/jdk/alpine/3.15/Dockerfile
diff --git a/8/jre/alpine/3.15/Dockerfile b/8/jre/alpine/3.15/Dockerfile
diff --git 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
@@ -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"]