Merge pull request #1919 from GoogleContainerTools/fix_java21_tagging

loosebazooka · web-flow · commit 40f9b1eeced6 · 2025-11-04T10:26:30.000-05:00
fix java21-debian13 tagging
diff --git a/BUILD b/BUILD
@@ -278,9 +278,9 @@ JAVA17 |= {
     for (tag_base, label) in JAVA_VARIATIONS
 }
 
-## JAVA 21 from temurin
+## JAVA 21
 JAVA21 = {
-    "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro
     for (tag_base, label) in JAVA_VARIATIONS
     for arch in JAVA_ARCHITECTURES
     for distro in DISTROS + PREVIEW_DISTROS
@@ -293,7 +293,7 @@ JAVA21 |= {
 }
 
 JAVA21 |= {
-    "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base: "//java:java21_" + label + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base: "//java:java21_" + label + "_" + distro
     for (tag_base, label) in JAVA_VARIATIONS
     for distro in DISTROS + PREVIEW_DISTROS
 }
diff --git a/examples/java/Dockerfile b/examples/java/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim AS build-env
+FROM eclipse-temurin:17-jdk AS build-env
 COPY . /app/examples
 WORKDIR /app
 RUN javac examples/*.java

Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,9 @@ JAVA17 \|= {`
`278`	`278`	`for (tag_base, label) in JAVA_VARIATIONS`
`279`	`279`	`}`
`280`	`280`
`281`		`-## JAVA 21 from temurin`
	`281`	`+## JAVA 21`
`282`	`282`	`JAVA21 = {`
`283`		`- "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro`
	`283`	`+ "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base + "-" + arch: "//java:java21_" + label + "_" + arch + "_" + distro`
`284`	`284`	`for (tag_base, label) in JAVA_VARIATIONS`
`285`	`285`	`for arch in JAVA_ARCHITECTURES`
`286`	`286`	`for distro in DISTROS + PREVIEW_DISTROS`
`@@ -293,7 +293,7 @@ JAVA21 \|= {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`JAVA21 \|= {`
`296`		`- "{REGISTRY}/{PROJECT_ID}/java21-debian12:" + tag_base: "//java:java21_" + label + "_" + distro`
	`296`	`+ "{REGISTRY}/{PROJECT_ID}/java21-" + distro + ":" + tag_base: "//java:java21_" + label + "_" + distro`
`297`	`297`	`for (tag_base, label) in JAVA_VARIATIONS`
`298`	`298`	`for distro in DISTROS + PREVIEW_DISTROS`
`299`	`299`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM openjdk:17-jdk-slim AS build-env`
	`1`	`+FROM eclipse-temurin:17-jdk AS build-env`
`2`	`2`	`COPY . /app/examples`
`3`	`3`	`WORKDIR /app`
`4`	`4`	`RUN javac examples/*.java`