Add OpenJDK 24

Author: sarahchen6

Dockerfile

@@ -7,6 +7,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:24-jdk /usr/java/openjdk-24 /usr/lib/jvm/24
 
 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
@@ -56,15 +57,16 @@ 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
 
-# Base image with minimunm requirenents to build the project.
+# 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
 
 # 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
 
-# Replace Docker Compose and yq versions by latest and remove docker-switch from CircleCI Base Image for security purposes
+# Replace Docker Compose and yq versions by latest and remove docker-switch from CircleCI Base Image for security purposes.
 RUN <<-EOT
 	set -eu
 	dockerPluginDir=/usr/local/lib/docker/cli-plugins
@@ -107,15 +109,16 @@ EOT
 # IBM specific env variables
 ENV IBM_JAVA_OPTIONS="-XX:+UseContainerSupport"
 
-#Set some odd looking variables, since their default values are wrong and it is unclear how they are used
+# Set some odd looking variables, since their default values are wrong and it is unclear how they are used.
 ENV JAVA_DEBIAN_VERSION=unused
 ENV JAVA_VERSION=unused
 
-# Setup environment variables to point to all jvms we have
+# Set up environment variables to point to all jvms we have.
 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_HOME=${JAVA_8_HOME}
 ENV PATH=${JAVA_HOME}/bin:${PATH}

README.md

@@ -1,4 +1,3 @@
-
 # dd-trace-java-docker-build
 
 Docker images for continuous integration jobs at [dd-trace-java](https://github.com/datadog/dd-trace-java).
@@ -8,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` 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 `24`, contains the base Eclipse Temurin JDK 8, 11, 17, 21 and 24 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)
+readonly BASE_VARIANTS=(8 11 17 21 24)
 
 readonly VARIANTS=(
     7
@@ -139,6 +139,7 @@ function do_inner_test() {
     "$JAVA_11_HOME/bin/java" -version
     "$JAVA_17_HOME/bin/java" -version
     "$JAVA_21_HOME/bin/java" -version
+    "$JAVA_24_HOME/bin/java" -version
     if [[ $variant != base && $variant != latest ]]; then
         env_lower="JAVA_${variant_lower}_HOME"
         env_upper="JAVA_${variant_upper}_HOME"