Add LATEST_VERSION parameter

Author: sarahchen6

Dockerfile

@@ -1,13 +1,17 @@
 # syntax=docker/dockerfile:1.6
 
+ARG LATEST_VERSION
+FROM eclipse-temurin:${LATEST_VERSION}-jdk-noble AS temurin-latest
+
 # Intermediate image used to prune cruft from JDKs and squash them all.
 FROM cimg/base:current-22.04 AS all-jdk
+ARG LATEST_VERSION
 
 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:24-jdk /usr/java/openjdk-24 /usr/lib/jvm/24
+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
@@ -52,16 +56,18 @@ RUN <<-EOT
 EOT
 
 FROM scratch AS default-jdk
+ARG LATEST_VERSION=24
 
 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/24 /usr/lib/jvm/24
+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 CircleCI Base Image with Ubuntu 22.04.3 LTS, present in most runners.
 FROM cimg/base:current-22.04 AS base
+ARG LATEST_VERSION=24
 
 # https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
 LABEL org.opencontainers.image.source=https://github.com/DataDog/dd-trace-java-docker-build
@@ -118,7 +124,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_24_HOME=/usr/lib/jvm/24
+ENV JAVA_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION}
 
 ENV JAVA_HOME=${JAVA_8_HOME}
 ENV PATH=${JAVA_HOME}/bin:${PATH}

README.md

@@ -7,9 +7,9 @@ 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`, and `21`, contains the base Eclipse Temurin JDK 8, 11, 17, and 21 versions,
+- The `base` variant, and its aliases `8`, `11`, `17`, `21`, and `latest`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, and latest JDK versions,
 - The `zulu8`, `zulu11`, `oracle8`, `ibm8`, `semeru8`, `semeru11`, `semeru17`, `graalvm17` and `graalvm21` variants all contain the base JDKs in addition to their specific JDK from their name,
-- The `latest` variant contains the base JDKs and all the above specific JDKs, including OpenJDK 24.
+- The `latest` variant contains the base JDKs and all the above specific JDKs.
 
 ## Development
 

build

@@ -45,6 +45,23 @@ 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
@@ -54,6 +71,7 @@ function docker_build() {
     shift
     shift
     docker build \
+        --build-arg LATEST_VERSION=$LATEST_VERSION \
         --platform linux/amd64 \
         --label org.opencontainers.image.created="$BUILD_DATE" \
         --label org.opencontainers.image.source=https://github.com/DataDog/dd-trace-java-docker-build \
@@ -71,6 +89,7 @@ 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
@@ -130,16 +149,19 @@ function do_test() {
 }
 
 function do_inner_test() {
+    compute_latest_version
     local variant="${1}"
     variant_lower="${variant,,}"
     variant_upper="${variant^^}"
+    java_latest_home="JAVA_${LATEST_VERSION}_HOME"
     set -x
     "$JAVA_HOME/bin/java" -version
     "$JAVA_8_HOME/bin/java" -version
     "$JAVA_11_HOME/bin/java" -version
     "$JAVA_17_HOME/bin/java" -version
     "$JAVA_21_HOME/bin/java" -version
-    "$JAVA_24_HOME/bin/java" -version
+    "${!java_latest_home}/bin/java" -version
+
     if [[ $variant != base && $variant != latest ]]; then
         env_lower="JAVA_${variant_lower}_HOME"
         env_upper="JAVA_${variant_upper}_HOME"