From 82f2b4764b908b54758ba9393942a979748d02a0 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Tue, 1 Jul 2025 17:32:01 -0400 Subject: [PATCH 1/3] Add JDK 25 --- Dockerfile | 3 +++ README.md | 2 +- build | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1b543c..16212fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ COPY --from=eclipse-temurin:8-jdk-jammy /opt/java/openjdk /usr/lib/jvm/8 COPY --from=eclipse-temurin:11-jdk-jammy /opt/java/openjdk /usr/lib/jvm/11 COPY --from=eclipse-temurin:17-jdk-jammy /opt/java/openjdk /usr/lib/jvm/17 COPY --from=eclipse-temurin:21-jdk-jammy /opt/java/openjdk /usr/lib/jvm/21 +COPY --from=openjdk:25-jdk-bookworm /opt/java/openjdk /usr/lib/jvm/25 COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION} COPY --from=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7 @@ -91,6 +92,7 @@ COPY --from=all-jdk /usr/lib/jvm/8 /usr/lib/jvm/8 COPY --from=all-jdk /usr/lib/jvm/11 /usr/lib/jvm/11 COPY --from=all-jdk /usr/lib/jvm/17 /usr/lib/jvm/17 COPY --from=all-jdk /usr/lib/jvm/21 /usr/lib/jvm/21 +COPY --from=all-jdk /usr/lib/jvm/25 /usr/lib/jvm/25 COPY --from=all-jdk /usr/lib/jvm/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION} # Base image with minimum requirements to build the project. @@ -169,6 +171,7 @@ ENV JAVA_8_HOME=/usr/lib/jvm/8 ENV JAVA_11_HOME=/usr/lib/jvm/11 ENV JAVA_17_HOME=/usr/lib/jvm/17 ENV JAVA_21_HOME=/usr/lib/jvm/21 +ENV JAVA_25_HOME=/usr/lib/jvm/25 ENV JAVA_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION} ENV JAVA_HOME=${JAVA_8_HOME} diff --git a/README.md b/README.md index 26942d7..47448fc 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Docker images for continuous integration jobs at [dd-trace-java](https://github. Pre-built images are available in [GitHub Container Registry](https://github.com/DataDog/dd-trace-java-docker-build/pkgs/container/dd-trace-java-docker-build). Image variants are available on a per JDK basis: -- The `base` variant, and its aliases `8`, `11`, `17`, `21`, and `stable`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, and latest stable JDK versions, +- The `base` variant, and its aliases `8`, `11`, `17`, `21`, `25`, and `stable`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, 25 early access, and latest stable JDK versions, - The `zulu8`, `zulu11`, `oracle8`, `ibm8`, `semeru8`, `semeru11`, `semeru17`, `graalvm17` and `graalvm21` variants all contain the base JDKs in addition to the specific JDK from their name, - The `latest` variant contains the base JDKs and all the above specific JDKs. diff --git a/build b/build index 06764a7..b8d5fd2 100755 --- a/build +++ b/build @@ -3,7 +3,7 @@ set -eu readonly IMAGE_NAME="ghcr.io/datadog/dd-trace-java-docker-build" -readonly BASE_VARIANTS=(8 11 17 21 stable) # add an ea variant once the early access build is available +readonly BASE_VARIANTS=(8 11 17 21 25 stable) # add an ea variant once the early access build is available readonly VARIANTS=( 7 @@ -158,6 +158,7 @@ function do_inner_test() { "$JAVA_11_HOME/bin/java" -version "$JAVA_17_HOME/bin/java" -version "$JAVA_21_HOME/bin/java" -version + "$JAVA_25_HOME/bin/java" -version "${!java_latest_home}/bin/java" -version if [[ $variant != base && $variant != latest ]]; then if [[ $variant == "stable" ]]; then From 36ec8da142e402a24324e447f2bc3d0c395852ef Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 2 Jul 2025 13:40:53 -0400 Subject: [PATCH 2/3] Fix copy command --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 16212fd..30ec3ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ COPY --from=eclipse-temurin:8-jdk-jammy /opt/java/openjdk /usr/lib/jvm/8 COPY --from=eclipse-temurin:11-jdk-jammy /opt/java/openjdk /usr/lib/jvm/11 COPY --from=eclipse-temurin:17-jdk-jammy /opt/java/openjdk /usr/lib/jvm/17 COPY --from=eclipse-temurin:21-jdk-jammy /opt/java/openjdk /usr/lib/jvm/21 -COPY --from=openjdk:25-jdk-bookworm /opt/java/openjdk /usr/lib/jvm/25 +COPY --from=openjdk:25-jdk-bookworm /usr/local/openjdk-25 /usr/lib/jvm/25 COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION} COPY --from=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7 From f1bcc3f50907f624a87165e143e170f09f5cc924 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Thu, 3 Jul 2025 12:15:52 -0400 Subject: [PATCH 3/3] Add comment to update image once JDK 25 is generally available --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 30ec3ec..8c993a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ COPY --from=eclipse-temurin:8-jdk-jammy /opt/java/openjdk /usr/lib/jvm/8 COPY --from=eclipse-temurin:11-jdk-jammy /opt/java/openjdk /usr/lib/jvm/11 COPY --from=eclipse-temurin:17-jdk-jammy /opt/java/openjdk /usr/lib/jvm/17 COPY --from=eclipse-temurin:21-jdk-jammy /opt/java/openjdk /usr/lib/jvm/21 +# TODO: Update to eclipse-temurin once JDK 25 is generally available (ETA Sep 16). COPY --from=openjdk:25-jdk-bookworm /usr/local/openjdk-25 /usr/lib/jvm/25 COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION}