Change base tag latest to latest_base

Author: sarahchen6

Dockerfile

@@ -132,15 +132,13 @@ ENV PATH=${JAVA_HOME}/bin:${PATH}
 FROM base AS variant
 ARG VARIANT_LOWER
 ARG VARIANT_UPPER
-ARG LATEST_VERSION
 
 COPY --from=all-jdk /usr/lib/jvm/${VARIANT_LOWER} /usr/lib/jvm/${VARIANT_LOWER}
 ENV JAVA_${VARIANT_UPPER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
 ENV JAVA_${VARIANT_LOWER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
 
 # Full image for debugging, contains all JDKs.
 FROM base AS full
-ARG LATEST_VERSION
 
 COPY --from=all-jdk /usr/lib/jvm/7 /usr/lib/jvm/7
 COPY --from=all-jdk /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8

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 `latest`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, and latest JDK versions,
+- The `base` variant, and its aliases `8`, `11`, `17`, `21`, and `latest_base`, 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.
 

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 latest)
+readonly BASE_VARIANTS=(8 11 17 21 latest_base)
 
 readonly VARIANTS=(
     7
@@ -163,6 +163,10 @@ function do_inner_test() {
     "${!java_latest_home}/bin/java" -version
 
     if [[ $variant != base && $variant != latest ]]; then
+        if [[ $variant == "latest_base" ]]; then
+            variant_lower="${LATEST_VERSION}"
+            variant_upper="${LATEST_VERSION}"
+        fi
         env_lower="JAVA_${variant_lower}_HOME"
         env_upper="JAVA_${variant_upper}_HOME"
         "${!env_lower}/bin/java" -version
@@ -171,10 +175,10 @@ function do_inner_test() {
 }
 
 function do_describe() {
-    local image
     compute_metadata
     compute_latest_version
     docker_build full "$(image_name latest)"
+    local image
     image="$(image_name latest)"
     docker run \
         --user "$(id -u):$(id -g)" \
@@ -205,7 +209,7 @@ function do_inner_describe() {
     echo "## JDKs"
     echo
     for variant in "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
-        if [[ $variant == "latest" ]]; then
+        if [[ $variant == "latest_base" ]]; then
             variant_upper="${LATEST_VERSION}"
         else
             variant_upper="${variant^^}"