Merge pull request #902 from GoogleContainerTools/java-publish

Publish more java images
GoogleContainerTools · Dec 4, 2021 · b19f550 · b19f550
2 parents 2e95ca8 + 685e072
commit b19f550
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 32 deletions.
diff --git a/BUILD b/BUILD
@@ -152,23 +152,84 @@ NODEJS = {
     "{REGISTRY}/{PROJECT_ID}/nodejs-debian11:16-debug": "//nodejs:nodejs16_debug_amd64_debian11",
 }
 
-JAVA = {
+JAVA_BASE = {
+    "{REGISTRY}/{PROJECT_ID}/java-base:latest": "//java:java_base_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-base:nonroot": "//java:java_base_nonroot_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-base:debug": "//java:java_base_debug_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-base:debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-base-debian10:latest": "//java:java_base_root_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java-base-debian10:nonroot": "//java:java_base_nonroot_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java-base-debian10:debug": "//java:java_base_debug_root_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java-base-debian10:debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian10",
+}
+
+JAVA_BASE.update({
+    "{REGISTRY}/{PROJECT_ID}/java-base-debian11:" + tag_base + "-" + arch: "//java:java_base_" + label + "_" + arch + "_debian11"
+    for arch in BASE_ARCHITECTURES
+    for (tag_base, label) in [
+        ("latest", "root"),
+        ("nonroot", "nonroot"),
+        ("debug", "debug_root"),
+        ("debug-nonroot", "debug_nonroot"),
+    ]
+})
+
+JAVA11 = {
+    "{REGISTRY}/{PROJECT_ID}/java11:latest": "//java:java11_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java11:nonroot": "//java:java11_nonroot_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java11:debug": "//java:java11_debug_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java11:debug-nonroot": "//java:java11_debug_nonroot_amd64_debian11",
+
+    # java11-debian10 is not multi arch
+    "{REGISTRY}/{PROJECT_ID}/java11-debian10:latest": "//java:java11_root_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java11-debian10:nonroot": "//java:java11_nonroot_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java11-debian10:debug": "//java:java11_debug_root_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java11-debian10:debug-nonroot": "//java:java11_debug_nonroot_amd64_debian10",
+}
+
+JAVA11.update({
+    "{REGISTRY}/{PROJECT_ID}/java11-debian11:" + tag_base + "-" + arch: "//java:java11_" + label + "_" + arch + "_debian11"
+    for (tag_base, label) in [
+        ("latest", "root"),
+        ("nonroot", "nonroot"),
+        ("debug", "debug_root"),
+        ("debug-nonroot", "debug_nonroot"),
+    ]
+    for arch in BASE_ARCHITECTURES
+})
+
+JAVA17 = {
+    "{REGISTRY}/{PROJECT_ID}/java17:latest": "//java:java17_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java17:nonroot": "//java:java17_nonroot_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java17:debug": "//java:java17_debug_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java17:debug-nonroot": "//java:java17_debug_nonroot_amd64_debian11",
+}
+
+JAVA17.update({
+    "{REGISTRY}/{PROJECT_ID}/java17-debian11:" + tag_base + "-" + arch: "//java:java17_" + label + "_" + arch + "_debian11"
+    for (tag_base, label) in [
+        ("latest", "root"),
+        ("nonroot", "nonroot"),
+        ("debug", "debug_root"),
+        ("debug-nonroot", "debug_nonroot"),
+    ]
+    for arch in BASE_ARCHITECTURES
+})
+
+# these are existing legacy tags that are scheduled to be removed
+LEGACY_JAVA_TAGS = {
     "{REGISTRY}/{PROJECT_ID}/java:base": "//java:java_base_root_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java:base-nonroot": "//java:java_base_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java:base-debug": "//java:java_base_debug_root_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java:base-debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:latest": "//java:java11_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:nonroot": "//java:java11_nonroot_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:debug": "//java:java11_debug_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:debug-nonroot": "//java:java11_debug_nonroot_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:11": "//java:java11_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:11-nonroot": "//java:java11_nonroot_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:11-debug": "//java:java11_debug_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java:11-debug-nonroot": "//java:java11_debug_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:base": "//java:java_base_root_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:base-nonroot": "//java:java_base_nonroot_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:base-debug": "//java:java_base_debug_root_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:base-debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian10",
+    "{REGISTRY}/{PROJECT_ID}/java-debian11:base": "//java:java_base_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-nonroot": "//java:java_base_nonroot_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-debug": "//java:java_base_debug_root_amd64_debian11",
+    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:latest": "//java:java11_root_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:nonroot": "//java:java11_nonroot_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:11": "//java:java11_root_amd64_debian10",
@@ -177,10 +238,6 @@ JAVA = {
     "{REGISTRY}/{PROJECT_ID}/java-debian10:debug-nonroot": "//java:java11_debug_nonroot_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:11-debug": "//java:java11_debug_root_amd64_debian10",
     "{REGISTRY}/{PROJECT_ID}/java-debian10:11-debug-nonroot": "//java:java11_debug_nonroot_amd64_debian10",
-    "{REGISTRY}/{PROJECT_ID}/java-debian11:base": "//java:java_base_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-nonroot": "//java:java_base_nonroot_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-debug": "//java:java_base_debug_root_amd64_debian11",
-    "{REGISTRY}/{PROJECT_ID}/java-debian11:base-debug-nonroot": "//java:java_base_debug_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian11:latest": "//java:java11_root_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian11:nonroot": "//java:java11_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian11:11": "//java:java11_root_amd64_debian11",
@@ -189,6 +246,9 @@ JAVA = {
     "{REGISTRY}/{PROJECT_ID}/java-debian11:debug-nonroot": "//java:java11_debug_nonroot_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian11:11-debug": "//java:java11_debug_root_amd64_debian11",
     "{REGISTRY}/{PROJECT_ID}/java-debian11:11-debug-nonroot": "//java:java11_debug_nonroot_amd64_debian11",
+}
+
+JETTY = {
     "{REGISTRY}/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java11_debian11",
     "{REGISTRY}/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java11_debug_debian11",
     "{REGISTRY}/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11_debian11",
@@ -215,7 +275,15 @@ ALL.update(PYTHON3)
 
 ALL.update(NODEJS)
 
-ALL.update(JAVA)
+ALL.update(JAVA_BASE)
+
+ALL.update(JAVA11)
+
+ALL.update(JAVA17)
+
+ALL.update(LEGACY_JAVA_TAGS)
+
+ALL.update(JETTY)
 
 container_bundle(
     name = "all",
@@ -233,20 +301,3 @@ container_push(
     # https://github.com/bazelbuild/rules_docker/issues/525
     sequential = True,
 )
-
-# do not publish these until java 17 is out of preview, leave them here for preview testing
-JAVA17 = {
-    "distroless/java:17": "//java:java17_root_amd64_debian11",
-    "distroless/java:17-nonroot": "//java:java17_nonroot_amd64_debian11",
-    "distroless/java:17-debug": "//java:java17_debug_root_amd64_debian11",
-    "distroless/java:17-debug-nonroot": "//java:java17_debug_nonroot_amd64_debian11",
-    "distroless/java:17-arm64": "//java:java17_root_arm64_debian11",
-    "distroless/java:17-nonroot-arm64": "//java:java17_nonroot_arm64_debian11",
-    "distroless/java:17-debug-arm64": "//java:java17_debug_root_arm64_debian11",
-    "distroless/java:17-debug-nonroot-arm64": "//java:java17_debug_nonroot_arm64_debian11",
-}
-
-container_bundle(
-    name = "java17_preview",
-    images = JAVA17,
-)
diff --git a/cloudbuild_cosign.sh b/cloudbuild_cosign.sh
@@ -40,3 +40,10 @@ done
 
 cosign sign "$@" gcr.io/$PROJECT_ID/nodejs:latest
 cosign sign "$@" gcr.io/$PROJECT_ID/nodejs:debug
+
+for java_version in -base 11 17; do
+  cosign sign "$@" gcr.io/$PROJECT_ID/java${java_version}-debian11:latest
+  cosign sign "$@" gcr.io/$PROJECT_ID/java${java_version}-debian11:nonroot
+  cosign sign "$@" gcr.io/$PROJECT_ID/java${java_version}-debian11:debug
+  cosign sign "$@" gcr.io/$PROJECT_ID/java${java_version}-debian11:debug-nonroot
+done
diff --git a/cloudbuild_docker.sh b/cloudbuild_docker.sh
@@ -57,4 +57,11 @@ docker manifest create gcr.io/$PROJECT_ID/nodejs:debug \
    gcr.io/$PROJECT_ID/nodejs:debug-arm64
 docker manifest push gcr.io/$PROJECT_ID/nodejs:debug
 
-# No Java? Only available on amd64, we do not need to generate a manifest list
+
+# java is only multi-arch from debian11 onwards
+for java_version in -base 11 17; do
+  docker manifest create gcr.io/$PROJECT_ID/java${java_version}-debian11:latest "amd64 arm64"
+  docker manifest create gcr.io/$PROJECT_ID/java${java_version}-debian11:nonroot "amd64 arm64"
+  docker manifest create gcr.io/$PROJECT_ID/java${java_version}-debian11:debug "amd64 arm64"
+  docker manifest create gcr.io/$PROJECT_ID/java${java_version}-debian11:debug-nonroot "amd64 arm64"
+done