Address review comments

Author: sarahchen6

Dockerfile

@@ -68,6 +68,7 @@ COPY --from=all-jdk /usr/lib/jvm/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION
 # 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
+ENV LATEST_VERSION=${LATEST_VERSION}
 
 # 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

README.md

@@ -7,8 +7,8 @@ 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_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 `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 `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.
 
 ## Development

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_base)
+readonly BASE_VARIANTS=(8 11 17 21 stable) # add an ea variant once the early access build is available
 
 readonly VARIANTS=(
     7
@@ -149,7 +149,6 @@ function do_test() {
 }
 
 function do_inner_test() {
-    compute_latest_version
     local variant="${1}"
     variant_lower="${variant,,}"
     variant_upper="${variant^^}"
@@ -161,9 +160,8 @@ function do_inner_test() {
     "$JAVA_17_HOME/bin/java" -version
     "$JAVA_21_HOME/bin/java" -version
     "${!java_latest_home}/bin/java" -version
-
     if [[ $variant != base && $variant != latest ]]; then
-        if [[ $variant == "latest_base" ]]; then
+        if [[ $variant == "stable" ]]; then
             variant_lower="${LATEST_VERSION}"
             variant_upper="${LATEST_VERSION}"
         fi
@@ -176,8 +174,6 @@ function do_inner_test() {
 
 function do_describe() {
     compute_metadata
-    compute_latest_version
-    docker_build full "$(image_name latest)"
     local image
     image="$(image_name latest)"
     docker run \
@@ -190,7 +186,6 @@ function do_describe() {
 }
 
 function do_inner_describe() {
-    compute_latest_version
     echo "# Contents"
     echo
     echo "## Operating System"
@@ -209,7 +204,7 @@ function do_inner_describe() {
     echo "## JDKs"
     echo
     for variant in "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
-        if [[ $variant == "latest_base" ]]; then
+        if [[ $variant == "stable" ]]; then
             variant_upper="${LATEST_VERSION}"
         else
             variant_upper="${variant^^}"