Merge pull request #2023 from GoogleContainerTools/byebyejava12

Remove java debian12 builds

Author: loosebazooka

MODULE.bazel

@@ -43,7 +43,6 @@ busybox.archive()
 use_repo(busybox, "busybox_amd64", "busybox_arm", "busybox_arm64", "busybox_ppc64le", "busybox_riscv64", "busybox_s390x")
 
 ### JAVA ###
-include("//private/repos/java_temurin:java.MODULE.bazel")
 
 ### NODE ###
 node = use_extension("//private/extensions:node.bzl", "node")

MODULE.bazel.lock

@@ -38,9 +38,6 @@ Any other tags are considered deprecated and are no longer updated
 | gcr.io/distroless/base-nossl-debian12 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
 | gcr.io/distroless/cc-debian12         | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
 | gcr.io/distroless/python3-debian12    | latest, nonroot, debug, debug-nonroot | amd64, arm64                      |
-| gcr.io/distroless/java-base-debian12  | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le      |
-| gcr.io/distroless/java17-debian12     | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le      |
-| gcr.io/distroless/java21-debian12     | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le      |
 | gcr.io/distroless/nodejs20-debian12   | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
 | gcr.io/distroless/nodejs22-debian12   | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
 | gcr.io/distroless/nodejs24-debian12   | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le      |
@@ -56,6 +53,7 @@ Debian 13 distroless images use the debian [UsrMerge](https://wiki.debian.org/Us
 | gcr.io/distroless/base-nossl-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
 | gcr.io/distroless/cc-debian13         | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
 | gcr.io/distroless/java-base-debian13  | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le               |
+| gcr.io/distroless/java17-debian13     | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le               |
 | gcr.io/distroless/java21-debian13     | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le               |
 | gcr.io/distroless/java25-debian13     | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le               |
 | gcr.io/distroless/nodejs20-debian13   | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le          |
@@ -218,7 +216,7 @@ $ docker run --entrypoint=sh -ti my_debug_image
 BUILD       Dockerfile  hello.py
 ```
 
-> Note: If the image you are using already has a tag, for example `gcr.io/distroless/java17-debian12:nonroot`, use the tag `debug-<existing tag>` instead, for example `gcr.io/distroless/java17-debian12:debug-nonroot`.
+> Note: If the image you are using already has a tag, for example `gcr.io/distroless/java17-debian13:nonroot`, use the tag `debug-<existing tag>` instead, for example `gcr.io/distroless/java17-debian13:debug-nonroot`.
 
 > Note: [ldd](http://man7.org/linux/man-pages/man1/ldd.1.html) is not installed in the base image as it's a shell script, you can copy it in or download it.
 

README.md

@@ -1,15 +1,31 @@
 load("@aspect_bazel_lib//lib:tar.bzl", "tar")
 load("@rules_distroless//distroless:defs.bzl", "cacerts", "group", "home", "locale", "os_release", "passwd")
-load("//:distro.bzl", "ALL_ARCHITECTURES", "ALL_DISTROS", "VERSIONS")
+load("//:distro.bzl", "ALL_DISTROS", "VERSIONS")
 load("//private/util:deb.bzl", "deb")
 load(":variables.bzl", "NOBODY", "NONROOT", "OS_RELEASE", "ROOT", "quote")
 
 package(default_visibility = ["//visibility:public"])
 
-COMMON_ARCHITECTURES = ALL_ARCHITECTURES
-
 COMMON_DISTROS = ALL_DISTROS
 
+COMMON_ARCHITECTURES = {
+    "debian12": [
+        "amd64",
+        "arm64",
+        "arm",
+        "s390x",
+        "ppc64le",
+    ],
+    "debian13": [
+        "amd64",
+        "arm64",
+        "arm",
+        "s390x",
+        "ppc64le",
+        "riscv64",
+    ],
+}
+
 tar(
     name = "rootfs",
     srcs = [],
@@ -53,17 +69,17 @@ tar(
         charset = "C.utf8",
         package = deb.data(arch, distro, "libc-bin"),
     )
-    for arch in COMMON_ARCHITECTURES
     for distro in COMMON_DISTROS
+    for arch in COMMON_ARCHITECTURES[distro]
 ]
 
 [
     cacerts(
         name = "cacerts_%s_%s" % (distro, arch),
         package = deb.data(arch, distro, "ca-certificates"),
     )
-    for arch in COMMON_ARCHITECTURES
     for distro in COMMON_DISTROS
+    for arch in COMMON_ARCHITECTURES[distro]
 ]
 
 # create /etc/group with the root, tty, and staff groups

common/BUILD.bazel

@@ -7,7 +7,7 @@ load("//private/oci:defs.bzl", "java_image")
 package(default_visibility = ["//visibility:public"])
 
 JAVA_VERSIONS_PER_DISTRO = [
-    ("17", "debian12"),
+    ("17", "debian13"),
 ]
 
 [

examples/java/BUILD

@@ -4,7 +4,7 @@ WORKDIR /app
 RUN javac examples/*.java
 RUN jar cfe main.jar examples.HelloJava examples/*.class 
 
-FROM gcr.io/distroless/java17-debian12
+FROM gcr.io/distroless/java17-debian13
 COPY --from=build-env /app /app
 WORKDIR /app
 CMD ["main.jar"]

examples/java/Dockerfile

@@ -1,18 +1,8 @@
-load(":java.bzl", "java_base_image", "java_base_image_index", "java_build_base_image", "java_image_index", "java_openjdk_image", "java_temurin_image_from_adoptium_debs", "java_temurin_image_from_github_releases")
-load(":config.bzl", "JAVA_ARCHITECTURES", "JAVA_BASE_PACKAGES", "JAVA_BUILD_BASE_PACKAGES", "JAVA_DISTROS")
+load(":java.bzl", "java_base_image", "java_base_image_index", "java_image", "java_image_index")
+load(":config.bzl", "JAVA_ARCHITECTURES", "JAVA_BASE_PACKAGES", "JAVA_DISTROS")
 
 package(default_visibility = ["//visibility:public"])
 
-# unpublished build-base images (deprecated)
-[
-    java_build_base_image(
-        "debian12",
-        arch,
-        JAVA_BUILD_BASE_PACKAGES["debian12"],
-    )
-    for arch in JAVA_ARCHITECTURES["debian12"]
-]
-
 # publishable java base images
 [
     java_base_image(
@@ -32,17 +22,6 @@ package(default_visibility = ["//visibility:public"])
     for distro in JAVA_DISTROS
 ]
 
-# publishable java temurin images from github releases (deprecated)
-ADOPTIUM_GH_PER_DISTRO = [
-    ("21", "debian12"),
-]
-
-[
-    java_temurin_image_from_github_releases(distro, java_version, arch)
-    for java_version, distro in ADOPTIUM_GH_PER_DISTRO
-    for arch in JAVA_ARCHITECTURES[distro]
-]
-
 # publishable java temurin images from adoptium deb repository
 ADOPTIUM_DEB_PER_DISTRO = [
     ("17", "debian13"),
@@ -51,28 +30,17 @@ ADOPTIUM_DEB_PER_DISTRO = [
 ]
 
 [
-    java_temurin_image_from_adoptium_debs(distro, java_version, arch)
+    java_image(distro, java_version, arch)
     for java_version, distro in ADOPTIUM_DEB_PER_DISTRO
     for arch in JAVA_ARCHITECTURES[distro]
 ]
 
-# publishable java openjdk (from debian) images (deprecated)
-JAVA_OPENJDK_VERSIONS_PER_DISTRO = [
-    ("17", "debian12"),
-]
-
-[
-    java_openjdk_image(distro, java_version, arch)
-    for java_version, distro in JAVA_OPENJDK_VERSIONS_PER_DISTRO
-    for arch in JAVA_ARCHITECTURES[distro]
-]
-
 # all image indexes
 [
     java_image_index(
         distro,
         java_version,
         JAVA_ARCHITECTURES[distro],
     )
-    for java_version, distro in JAVA_OPENJDK_VERSIONS_PER_DISTRO + ADOPTIUM_GH_PER_DISTRO + ADOPTIUM_DEB_PER_DISTRO
+    for java_version, distro in ADOPTIUM_DEB_PER_DISTRO
 ]

…ava/testdata/hello_nonroot_debian12.yaml …ava/testdata/hello_nonroot_debian13.yamlexamples/java/testdata/hello_nonroot_debian12.yaml renamed to examples/java/testdata/hello_nonroot_debian13.yaml examples/java/testdata/hello_nonroot_debian12.yaml renamed to examples/java/testdata/hello_nonroot_debian13.yaml

@@ -6,8 +6,8 @@ This image contains a minimal Linux, OpenJDK-based runtime.
 
 Specifically, the image contains everything in the [base image](../base/README.md), plus:
 
-* OpenJDK 17 (`gcr.io/distroless/java17-debian12`) and its dependencies.
-* Temurin OpenJDK 21 (`gcr.io/distroless/java21-debian12`) and its dependencies
+* Temurin OpenJDK 17 (`gcr.io/distroless/java17-debian13`) and its dependencies.
+* Temurin OpenJDK 21 (`gcr.io/distroless/java21-debian13`) and its dependencies
 * Temurin OpenJDK 25 (`gcr.io/distroless/java25-debian13`) and its dependencies
 
 ## Usage
@@ -16,11 +16,9 @@ The entrypoint of this image is set to the equivalent of "java -jar", so this im
 
 ## Add another JAVA version
 
-To support JAVA version you need to do the following steps:
-- Create a new file `java_{newVersion}.MODULE.bazel` in the [java_temurin](private/repos/java_temurin) folder based on the latest created.
-- In the file, you must specify the tar.gz files used to build the images, ideally from this URL: `https://github.com/adoptium/temurin{newVersion}-binaries/releases`.
-- Add the new names in the [java.MODULE.bazel](private/repos/java_temurin/java.MODULE.bazel) file.
-- Add two yaml files in the [java/testdata](java/testdata) folder to prepare the tests, you can take inspiration on the other files.
-- Add the new version in `JAVA_TEMURIN_VERSIONS` and `JAVA_TEMURIN_VERSIONS_PER_DISTRO` (must be debian13 starting from Java 25).
+To support a new JAVA version you need to do the following steps:
+- Add the new version to `ADOPTIUM_DEB_PER_DISTRO` in [java/BUILD](BUILD).
+- Add the new version to `JAVA_MAJOR_VERSIONS` in [java/config.bzl](config.bzl).
+- Add two yaml files in the [java/testdata](testdata) folder to prepare the tests, you can take inspiration on the other files.
 
-You can then ensure everything works on this folder with `bazel build //java:...`
+You can then ensure everything works on this folder with `bazel build //java:...`