From ae228441f55adfd49c1e12af33c9dcf55187918e Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 15:35:08 -0400 Subject: [PATCH 1/3] Adjust JDK 25 EA build image --- Dockerfile | 8 ++++---- build | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c993a1..45d57ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,9 +50,9 @@ 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} +# TODO: Update to eclipse-temurin:25-jdk-noble 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=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7 COPY --from=azul/zulu-openjdk:8 /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8 @@ -93,8 +93,8 @@ 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} +COPY --from=all-jdk /usr/lib/jvm/25 /usr/lib/jvm/25 # Base image with minimum requirements to build the project. # Based on the latest Ubuntu LTS image. @@ -172,8 +172,8 @@ 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_25_HOME=/usr/lib/jvm/25 ENV JAVA_HOME=${JAVA_8_HOME} ENV PATH=${JAVA_HOME}/bin:${PATH} diff --git a/build b/build index b8d5fd2..c4964a7 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 25 stable) # add an ea variant once the early access build is available +readonly BASE_VARIANTS=(8 11 17 21 stable 25) # 25 is currently an ea variant readonly VARIANTS=( 7 @@ -158,8 +158,8 @@ 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 + "$JAVA_25_HOME/bin/java" -version if [[ $variant != base && $variant != latest ]]; then if [[ $variant == "stable" ]]; then variant_lower="${LATEST_VERSION}" From 119d5e9dd3fca5c8a8eeeb6875281c1e09446c9b Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 17:34:24 -0400 Subject: [PATCH 2/3] Revert files back to original --- Dockerfile | 8 ++++---- build | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45d57ba..8c993a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,9 +50,9 @@ 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=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION} -# TODO: Update to eclipse-temurin:25-jdk-noble once JDK 25 is generally available (ETA Sep 16). +# 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} COPY --from=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7 COPY --from=azul/zulu-openjdk:8 /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8 @@ -93,8 +93,8 @@ 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/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION} 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. # Based on the latest Ubuntu LTS image. @@ -172,8 +172,8 @@ 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_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION} ENV JAVA_25_HOME=/usr/lib/jvm/25 +ENV JAVA_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION} ENV JAVA_HOME=${JAVA_8_HOME} ENV PATH=${JAVA_HOME}/bin:${PATH} diff --git a/build b/build index c4964a7..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 25) # 25 is currently an ea variant +readonly BASE_VARIANTS=(8 11 17 21 25 stable) # add an ea variant once the early access build is available readonly VARIANTS=( 7 @@ -158,8 +158,8 @@ function do_inner_test() { "$JAVA_11_HOME/bin/java" -version "$JAVA_17_HOME/bin/java" -version "$JAVA_21_HOME/bin/java" -version - "${!java_latest_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 variant_lower="${LATEST_VERSION}" From 096ddd67e3fa2a967314da58c2fe73767d7bb513 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Wed, 9 Jul 2025 17:46:35 -0400 Subject: [PATCH 3/3] Set LATEST_VERSION to 24 --- build | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/build b/build index b8d5fd2..1c72d64 100755 --- a/build +++ b/build @@ -18,6 +18,8 @@ readonly VARIANTS=( graalvm21 ) +readonly LATEST_VERSION="24" + # Use buildkit to match CI as closely as possible. export DOCKER_BUILDKIT=1 @@ -44,23 +46,6 @@ function compute_metadata() { GIT_HEAD_REF="$(git show-ref --head --hash ^HEAD)" } -function compute_latest_version() { - # Java versions are typically released towards the end of the month in March and September, - # so we use the version from the previous release cycle until the month after the release. - local base_year=2025 - local base_version=23 - - version="$((base_version + ($(date +%Y) - base_year) * 2))" - if [ "$(date +%m)" -ge 4 ]; then - version="$((version + 1))" - fi - if [ "$(date +%m)" -ge 10 ]; then - version="$((version + 1))" - fi - - export LATEST_VERSION="$version" -} - # docker build wrapper with common arguments # See https://github.com/opencontainers/image-spec/blob/main/annotations.md for common labels # See https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package @@ -88,7 +73,6 @@ function image_name() { function do_build() { compute_metadata - compute_latest_version docker_build base "$(image_name base)" docker_build full "$(image_name latest)" if [ -n "${GITHUB_OUTPUT+unset}" ]; then