Skip to content

Commit b14866a

Browse files
bobcallawaybobcallaway
authored
Merge pull request #1914 from GoogleContainerTools/add-java21-debian13
Add java21 to debian13
2 parents 1352280 + 2e2e73c commit b14866a

File tree

8 files changed

+182
-13
lines changed

8 files changed

+182
-13
lines changed

‎BUILD‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,11 @@ NODEJS |= {
221221
}
222222

223223
## JAVA_BASE
224-
JAVA_OPENJDK_ARCHITECTURES = BASE_ARCHITECTURES + [
224+
JAVA_ARCHITECTURES = BASE_ARCHITECTURES + [
225225
"s390x",
226226
"ppc64le",
227227
]
228228

229-
JAVA_TEMURIN_ARCHITECTURES = JAVA_OPENJDK_ARCHITECTURES + [
230-
]
231-
232229
JAVA_VARIATIONS = [
233230
("latest", "root"),
234231
("nonroot", "nonroot"),
@@ -249,7 +246,7 @@ JAVA_BASE = {
249246

250247
JAVA_BASE |= {
251248
"{REGISTRY}/{PROJECT_ID}/java-base-debian12:" + tag_base + "-" + arch: "//java:java_base_" + label + "_" + arch + "_debian12"
252-
for arch in JAVA_OPENJDK_ARCHITECTURES
249+
for arch in JAVA_ARCHITECTURES
253250
for (tag_base, label) in JAVA_VARIATIONS
254251
}
255252

@@ -273,7 +270,7 @@ JAVA17 = {
273270
JAVA17 |= {
274271
"{REGISTRY}/{PROJECT_ID}/java17-debian12:" + tag_base + "-" + arch: "//java:java17_" + label + "_" + arch + "_debian12"
275272
for (tag_base, label) in JAVA_VARIATIONS
276-
for arch in JAVA_OPENJDK_ARCHITECTURES
273+
for arch in JAVA_ARCHITECTURES
277274
}
278275

279276
JAVA17 |= {
@@ -283,9 +280,10 @@ JAVA17 |= {
283280

284281
## JAVA 21 from temurin
285282
JAVA21 = {
286-
"{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_debian12"
283+
"{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro
287284
for (tag_base, label) in JAVA_VARIATIONS
288-
for arch in JAVA_TEMURIN_ARCHITECTURES
285+
for arch in JAVA_ARCHITECTURES
286+
for distro in DISTROS + PREVIEW_DISTROS
289287
}
290288

291289
# oci_image_index
@@ -295,15 +293,16 @@ JAVA21 |= {
295293
}
296294

297295
JAVA21 |= {
298-
"{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base: "//java:java21_" + label + "_debian12"
296+
"{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base: "//java:java21_" + label + "_" + distro
299297
for (tag_base, label) in JAVA_VARIATIONS
298+
for distro in DISTROS + PREVIEW_DISTROS
300299
}
301300

302301
## Java 25 from temurin, available on debian13
303302
JAVA25 = {
304303
"{REGISTRY}/{PROJECT_ID}/java25-debian13:" + tag_base + "-" + arch: "//java:java25_" + label + "_" + arch + "_debian13"
305304
for (tag_base, label) in JAVA_VARIATIONS
306-
for arch in JAVA_TEMURIN_ARCHITECTURES
305+
for arch in JAVA_ARCHITECTURES
307306
}
308307

309308
# oci_image_index

‎MODULE.bazel.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎java/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ ADOPTIUM_GH_PER_DISTRO = [
4848

4949
# publishable java temurin images from adoptium deb repository
5050
ADOPTIUM_DEB_PER_DISTRO = [
51+
("21", "debian13"),
5152
("25", "debian13"),
5253
]
5354

‎java/testdata/java21_debian13.yaml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
schemaVersion: "2.0.0"
2+
commandTests:
3+
- name: java
4+
command: "/usr/lib/jvm/temurin-21-jre-amd64/bin/java"
5+
args: ["-version"]
6+
expectedError: ['openjdk version "21.0.9"']
7+
- name: java-symlink
8+
command: "/usr/bin/java"
9+
args: ["-version"]
10+
expectedError: ['openjdk version "21.0.9"']
11+
fileExistenceTests:
12+
- name: certs
13+
path: "/etc/ssl/certs/java/cacerts"
14+
shouldExist: true
15+
- name: certs
16+
path: "/etc/ssl/certs/adoptium/cacerts"
17+
permissions: 'Lrwxrwxrwx'
18+
shouldExist: true
19+
- name: certs
20+
path: "/usr/lib/jvm/temurin-21-jre-amd64/lib/security/cacerts"
21+
permissions: 'Lrwxrwxrwx'
22+
shouldExist: true
23+
- name: no-busybox
24+
path: "/busybox/sh"
25+
shouldExist: false
26+
- name: no-shell
27+
path: "/bin/sh"
28+
shouldExist: false
29+
- name: no-javac
30+
path: "/usr/lib/jvm/temurin-21-jre-amd64/bin/javac"
31+
shouldExist: false
32+
- name: jexec-executable
33+
path: "/usr/lib/jvm/temurin-21-jre-amd64/lib/jexec"
34+
shouldExist: true
35+
isExecutableBy: "any"
36+
- name: jspawnhelper-executable
37+
path: "/usr/lib/jvm/temurin-21-jre-amd64/lib/jspawnhelper"
38+
shouldExist: true
39+
isExecutableBy: "any"
40+
metadataTest:
41+
envVars:
42+
- key: 'JAVA_VERSION'
43+
value: '21.0.9'

‎java/testdata/java21_debug_debian13.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
schemaVersion: "2.0.0"
2+
commandTests:
3+
- name: java
4+
command: "/usr/lib/jvm/temurin-21-jdk-amd64/bin/java"
5+
args: ["-version"]
6+
expectedError: ['openjdk version "21.0.9"']
7+
- name: java-symlink
8+
command: "/usr/bin/java"
9+
args: ["-version"]
10+
expectedError: ['openjdk version "21.0.9"']
11+
- name: javac
12+
command: "/usr/lib/jvm/temurin-21-jdk-amd64/bin/javac"
13+
args: ["-version"]
14+
expectedOutput: ['javac 21.0.9']
15+
fileExistenceTests:
16+
- name: certs
17+
path: "/etc/ssl/certs/java/cacerts"
18+
shouldExist: true
19+
- name: certs
20+
path: "/etc/ssl/certs/adoptium/cacerts"
21+
permissions: 'Lrwxrwxrwx'
22+
shouldExist: true
23+
- name: certs
24+
path: "/usr/lib/jvm/temurin-21-jdk-amd64/lib/security/cacerts"
25+
permissions: 'Lrwxrwxrwx'
26+
shouldExist: true
27+
- name: busybox
28+
path: "/busybox/sh"
29+
shouldExist: true
30+
- name: no-shell
31+
path: "/bin/sh"
32+
shouldExist: false
33+
metadataTest:
34+
envVars:
35+
- key: 'JAVA_VERSION'
36+
value: '21.0.9'

‎java/testdata/java25_debug_debian13.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ commandTests:
1111
- name: javac
1212
command: "/usr/lib/jvm/temurin-25-jdk-amd64/bin/javac"
1313
args: ["-version"]
14-
expectedOutput: ['javac 25']
14+
expectedOutput: ['javac 25.0.1']
1515
fileExistenceTests:
1616
- name: certs
1717
path: "/etc/ssl/certs/java/cacerts"

‎private/repos/deb/trixie_adoptium.lock.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
{
22
"packages": [
3+
{
4+
"arch": "amd64",
5+
"dependencies": [],
6+
"key": "temurin-21-jre_21.0.9.0.0-p-10-0_amd64",
7+
"name": "temurin-21-jre",
8+
"sha256": "9778e6691073b5f3a3800f89a20b94f471d0814ac1cdeddbc008d200de45b0b7",
9+
"urls": [
10+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.9.0.0+10-0_amd64.deb"
11+
],
12+
"version": "21.0.9.0.0+10-0"
13+
},
14+
{
15+
"arch": "amd64",
16+
"dependencies": [],
17+
"key": "temurin-21-jdk_21.0.9.0.0-p-10-0_amd64",
18+
"name": "temurin-21-jdk",
19+
"sha256": "f18d315830ddfc00f6eda329e8f5f74712add0cc940a94e58975ab5ee0d05ee4",
20+
"urls": [
21+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.9.0.0+10-0_amd64.deb"
22+
],
23+
"version": "21.0.9.0.0+10-0"
24+
},
325
{
426
"arch": "amd64",
527
"dependencies": [],
@@ -22,6 +44,28 @@
2244
],
2345
"version": "25.0.1.0.0+8-0"
2446
},
47+
{
48+
"arch": "arm64",
49+
"dependencies": [],
50+
"key": "temurin-21-jre_21.0.9.0.0-p-10-0_arm64",
51+
"name": "temurin-21-jre",
52+
"sha256": "86ba3b3313683298bb7c2f98bac3396ff92132614de9e01531675a952b5f407d",
53+
"urls": [
54+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.9.0.0+10-0_arm64.deb"
55+
],
56+
"version": "21.0.9.0.0+10-0"
57+
},
58+
{
59+
"arch": "arm64",
60+
"dependencies": [],
61+
"key": "temurin-21-jdk_21.0.9.0.0-p-10-0_arm64",
62+
"name": "temurin-21-jdk",
63+
"sha256": "53caee389adcd70f24c31016b16d06444004dbeddcfb991992ccd2eaa18226b4",
64+
"urls": [
65+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.9.0.0+10-0_arm64.deb"
66+
],
67+
"version": "21.0.9.0.0+10-0"
68+
},
2569
{
2670
"arch": "arm64",
2771
"dependencies": [],
@@ -44,6 +88,28 @@
4488
],
4589
"version": "25.0.1.0.0+8-0"
4690
},
91+
{
92+
"arch": "s390x",
93+
"dependencies": [],
94+
"key": "temurin-21-jre_21.0.9.0.0-p-10-0_s390x",
95+
"name": "temurin-21-jre",
96+
"sha256": "b573177fd6ac2e71f9d1e0ca3128ec3450d7dae016683112b9979f4f36438423",
97+
"urls": [
98+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.9.0.0+10-0_s390x.deb"
99+
],
100+
"version": "21.0.9.0.0+10-0"
101+
},
102+
{
103+
"arch": "s390x",
104+
"dependencies": [],
105+
"key": "temurin-21-jdk_21.0.9.0.0-p-10-0_s390x",
106+
"name": "temurin-21-jdk",
107+
"sha256": "ec60ebfaeca6a99d04e7c86955f5a9163b9b6401ebf355d695d26b93a9cd680f",
108+
"urls": [
109+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.9.0.0+10-0_s390x.deb"
110+
],
111+
"version": "21.0.9.0.0+10-0"
112+
},
47113
{
48114
"arch": "s390x",
49115
"dependencies": [],
@@ -66,6 +132,28 @@
66132
],
67133
"version": "25.0.1.0.0+8-0"
68134
},
135+
{
136+
"arch": "ppc64el",
137+
"dependencies": [],
138+
"key": "temurin-21-jre_21.0.8.0.0-p-9-0_ppc64el",
139+
"name": "temurin-21-jre",
140+
"sha256": "fb83cb94deca76fdb3ceaaa57bdfa756d66d8f7ec97da1901fd22eb65f170973",
141+
"urls": [
142+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.8.0.0+9-0_ppc64el.deb"
143+
],
144+
"version": "21.0.8.0.0+9-0"
145+
},
146+
{
147+
"arch": "ppc64el",
148+
"dependencies": [],
149+
"key": "temurin-21-jdk_21.0.8.0.0-p-9-0_ppc64el",
150+
"name": "temurin-21-jdk",
151+
"sha256": "01966a8b86a7973fe12c1578e22e09ccee679e415e987dccc870d25d8480cb7b",
152+
"urls": [
153+
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.8.0.0+9-0_ppc64el.deb"
154+
],
155+
"version": "21.0.8.0.0+9-0"
156+
},
69157
{
70158
"arch": "ppc64el",
71159
"dependencies": [],

‎private/repos/deb/trixie_adoptium.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ archs:
1313
- ppc64el
1414

1515
packages:
16+
- temurin-21-jre
17+
- temurin-21-jdk
1618
- temurin-25-jre
1719
- temurin-25-jdk

0 commit comments

Comments
 (0)