Skip to content

Commit 1402565

Browse files
lutkerdlutkerd
committed
Make AL2023 images the default for Corretto 22+
1 parent 3fef46a commit 1402565

File tree

2 files changed

+27
-161
lines changed

2 files changed

+27
-161
lines changed

‎.tags

-139
Original file line numberDiff line numberDiff line change
@@ -1,139 +0,0 @@
1-
Tags: 8, 8u382, 8u382-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u382-al2-generic, 8-al2-generic-jdk, latest
2-
Architectures: amd64, arm64v8
3-
Directory: 8/jdk/al2-generic
4-
5-
Tags: 8-al2023, 8u382-al2023, 8-al2023-jdk
6-
Architectures: amd64, arm64v8
7-
Directory: 8/jdk/al2023
8-
9-
Tags: 8-al2023-jre, 8u382-al2023-jre
10-
Architectures: amd64, arm64v8
11-
Directory: 8/jdk/al2023
12-
13-
Tags: 8-al2-native-jre, 8u382-al2-native-jre
14-
Architectures: amd64, arm64v8
15-
Directory: 8/jre/al2
16-
17-
Tags: 8-al2-native-jdk, 8u382-al2-native-jdk
18-
Architectures: amd64, arm64v8
19-
Directory: 8/jdk/al2
20-
21-
Tags: 8-alpine3.16, 8u382-alpine3.16, 8-alpine3.16-full, 8-alpine3.16-jdk
22-
Architectures: amd64, arm64v8
23-
Directory: 8/jdk/alpine/3.16
24-
25-
Tags: 8-alpine3.16-jre, 8u382-alpine3.16-jre
26-
Architectures: amd64, arm64v8
27-
Directory: 8/jre/alpine/3.16
28-
29-
Tags: 8-alpine3.17, 8u382-alpine3.17, 8-alpine3.17-full, 8-alpine3.17-jdk
30-
Architectures: amd64, arm64v8
31-
Directory: 8/jdk/alpine/3.17
32-
33-
Tags: 8-alpine3.17-jre, 8u382-alpine3.17-jre
34-
Architectures: amd64, arm64v8
35-
Directory: 8/jre/alpine/3.17
36-
37-
Tags: 8-alpine3.18, 8u382-alpine3.18, 8-alpine3.18-full, 8-alpine3.18-jdk, 8-alpine, 8u382-alpine, 8-alpine-full, 8-alpine-jdk
38-
Architectures: amd64, arm64v8
39-
Directory: 8/jdk/alpine/3.18
40-
41-
Tags: 8-alpine3.18-jre, 8u382-alpine3.18-jre, 8-alpine-jre, 8u382-alpine-jre
42-
Architectures: amd64, arm64v8
43-
Directory: 8/jre/alpine/3.18
44-
45-
Tags: 11, 11.0.20, 11.0.20-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.20-al2-generic, 11-al2-generic-jdk
46-
Architectures: amd64, arm64v8
47-
Directory: 11/jdk/al2-generic
48-
49-
Tags: 11-al2023, 11.0.20-al2023, 11-al2023-jdk
50-
Architectures: amd64, arm64v8
51-
Directory: 11/jdk/al2023
52-
53-
Tags: 11-al2023-headless, 11.0.20-al2023-headless
54-
Architectures: amd64, arm64v8
55-
Directory: 11/headless/al2023
56-
57-
Tags: 11-al2023-headful, 11.0.20-al2023-headful
58-
Architectures: amd64, arm64v8
59-
Directory: 11/headful/al2023
60-
61-
Tags: 11-al2-native-headless, 11.0.20-al2-native-headless
62-
Architectures: amd64, arm64v8
63-
Directory: 11/headless/al2
64-
65-
Tags: 11-al2-native-jdk, 11.0.20-al2-native-jdk
66-
Architectures: amd64, arm64v8
67-
Directory: 11/jdk/al2
68-
69-
Tags: 11-alpine3.16, 11.0.20-alpine3.16, 11-alpine3.16-full, 11-alpine3.16-jdk
70-
Architectures: amd64, arm64v8
71-
Directory: 11/jdk/alpine/3.16
72-
73-
Tags: 11-alpine3.17, 11.0.20-alpine3.17, 11-alpine3.17-full, 11-alpine3.17-jdk
74-
Architectures: amd64, arm64v8
75-
Directory: 11/jdk/alpine/3.17
76-
77-
Tags: 11-alpine3.18, 11.0.20-alpine3.18, 11-alpine3.18-full, 11-alpine3.18-jdk, 11-alpine, 11.0.20-alpine, 11-alpine-full, 11-alpine-jdk
78-
Architectures: amd64, arm64v8
79-
Directory: 11/jdk/alpine/3.18
80-
81-
Tags: 17, 17.0.8, 17.0.8-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.8-al2-generic, 17-al2-generic-jdk
82-
Architectures: amd64, arm64v8
83-
Directory: 17/jdk/al2-generic
84-
85-
Tags: 17-al2023, 17.0.8-al2023, 17-al2023-jdk
86-
Architectures: amd64, arm64v8
87-
Directory: 17/jdk/al2023
88-
89-
Tags: 17-al2023-headless, 17.0.8-al2023-headless
90-
Architectures: amd64, arm64v8
91-
Directory: 17/headless/al2023
92-
93-
Tags: 17-al2023-headful, 17.0.8-al2023-headful
94-
Architectures: amd64, arm64v8
95-
Directory: 17/headful/al2023
96-
97-
Tags: 17-al2-native-headless, 17.0.8-al2-native-headless
98-
Architectures: amd64, arm64v8
99-
Directory: 17/headless/al2
100-
101-
Tags: 17-al2-native-headful, 17.0.8-al2-native-headful
102-
Architectures: amd64, arm64v8
103-
Directory: 17/headful/al2
104-
105-
Tags: 17-al2-native-jdk, 17.0.8-al2-native-jdk
106-
Architectures: amd64, arm64v8
107-
Directory: 17/jdk/al2
108-
109-
Tags: 17-alpine3.16, 17.0.8-alpine3.16, 17-alpine3.16-full, 17-alpine3.16-jdk
110-
Architectures: amd64, arm64v8
111-
Directory: 17/jdk/alpine/3.16
112-
113-
Tags: 17-alpine3.17, 17.0.8-alpine3.17, 17-alpine3.17-full, 17-alpine3.17-jdk
114-
Architectures: amd64, arm64v8
115-
Directory: 17/jdk/alpine/3.17
116-
117-
Tags: 17-alpine3.18, 17.0.8-alpine3.18, 17-alpine3.18-full, 17-alpine3.18-jdk, 17-alpine, 17.0.8-alpine, 17-alpine-full, 17-alpine-jdk
118-
Architectures: amd64, arm64v8
119-
Directory: 17/jdk/alpine/3.18
120-
121-
Tags: 20, 20.0.2, 20.0.2-al2, 20-al2-full, 20-al2-jdk, 20-al2-generic, 20.0.2-al2-generic, 20-al2-generic-jdk
122-
Architectures: amd64, arm64v8
123-
Directory: 20/jdk/al2-generic
124-
125-
Tags: 20-al2023-generic, 20.0.2-al2023-generic, 20-al2023-generic-jdk
126-
Architectures: amd64, arm64v8
127-
Directory: 20/jdk/al2023-generic
128-
129-
Tags: 20-alpine3.16, 20.0.2-alpine3.16, 20-alpine3.16-full, 20-alpine3.16-jdk
130-
Architectures: amd64, arm64v8
131-
Directory: 20/jdk/alpine/3.16
132-
133-
Tags: 20-alpine3.17, 20.0.2-alpine3.17, 20-alpine3.17-full, 20-alpine3.17-jdk
134-
Architectures: amd64, arm64v8
135-
Directory: 20/jdk/alpine/3.17
136-
137-
Tags: 20-alpine3.18, 20.0.2-alpine3.18, 20-alpine3.18-full, 20-alpine3.18-jdk, 20-alpine, 20.0.2-alpine, 20-alpine-full, 20-alpine-jdk
138-
Architectures: amd64, arm64v8
139-
Directory: 20/jdk/alpine/3.18

‎bin/tag-generator.py

+27-22
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,49 @@
33
DEFAULT_ALPINE_VERSION = '3.19'
44
ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19']
55

6-
LTS_VERSIONS = [ "8", "11", "17", "21"]
7-
FR_VERSIONS = [ "22" ]
86
def generate_tags(key, version):
97
update = version.split('.')[1] if (key == '8') else version.split('.')[2]
108
expanded_version = f"{key}u{update}" if (key == '8') else f"{key}.0.{update}"
119

1210
al2023_tags = [f"{key}-al2023", f"{expanded_version}-al2023" ,f"{key}-al2023-jdk"]
13-
al2023_generic_tags = [f"{key}-al2023-generic", f"{expanded_version}-al2023-generic", f"{key}-al2023-generic-jdk"]
11+
al2023_headless_tags = [f"{key}-al2023-headless", f"{expanded_version}-al2023-headless"]
12+
al2023_headful_tags = [f"{key}-al2023-headful", f"{expanded_version}-al2023-headful"]
13+
# These only apply for Corretto8 which does not have the same modulare packages as 11+
14+
al2023_8_tags = [f"{key}-al2023-jre", f"{expanded_version}-al2023-jre"]
15+
1416
if int(key) <= 21:
1517
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"]
18+
if key == '8':
19+
al2_tags.append('latest')
1620
print("Tags: " + ", ".join(al2_tags) + "")
1721
print("Architectures: amd64, arm64v8")
1822
print(f"Directory: {key}/jdk/al2-generic\n")
19-
else:
20-
al2_tags = []
21-
if key == '8':
22-
al2_tags.append('latest')
2323

24+
# Starting with Corretto 22 AL2 based images are not longer vended and AL2023 will be the
25+
# default base OS until the next AL version is GA.
26+
if int(key) >= 22:
27+
al2023_tags.append(f"{key}")
28+
al2023_tags.append(f"{key}-jdk")
29+
al2023_headless_tags.append(f"{key}-headless")
30+
al2023_headful_tags.append(f"{key}-headful")
2431

25-
if key in LTS_VERSIONS or key in FR_VERSIONS:
26-
print("Tags: " + ", ".join(al2023_tags) + "")
32+
print("Tags: " + ", ".join(al2023_tags) + "")
33+
print("Architectures: amd64, arm64v8")
34+
print(f"Directory: {key}/jdk/al2023\n")
35+
if key == '8':
36+
print("Tags: " + ", ".join(al2023_8_tags))
2737
print("Architectures: amd64, arm64v8")
2838
print(f"Directory: {key}/jdk/al2023\n")
29-
if key == '8':
30-
print("Tags: " + ", ".join([f"{key}-al2023-jre", f"{expanded_version}-al2023-jre"]))
31-
print("Architectures: amd64, arm64v8")
32-
print(f"Directory: {key}/jdk/al2023\n")
33-
else:
34-
print("Tags: " + ", ".join([f"{key}-al2023-headless", f"{expanded_version}-al2023-headless"]))
35-
print("Architectures: amd64, arm64v8")
36-
print(f"Directory: {key}/headless/al2023\n")
37-
38-
print("Tags: " + ", ".join([f"{key}-al2023-headful", f"{expanded_version}-al2023-headful"]))
39-
print("Architectures: amd64, arm64v8")
40-
print(f"Directory: {key}/headful/al2023\n")
39+
else:
40+
print("Tags: " + ", ".join(al2023_headless_tags))
41+
print("Architectures: amd64, arm64v8")
42+
print(f"Directory: {key}/headless/al2023\n")
4143

44+
print("Tags: " + ", ".join(al2023_headful_tags))
45+
print("Architectures: amd64, arm64v8")
46+
print(f"Directory: {key}/headful/al2023\n")
4247

43-
# For LTS versions with modular AmazonLinux packages we want to tag those images
48+
# For LTS versions with modular AmazonLinux 2 packages we want to tag those images
4449
native_package_modifier="al2-native-"
4550
if key in ["17"]:
4651
for image_type in ['headless', 'headful', 'jdk']:

0 commit comments

Comments
 (0)