Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ COPY --from=eclipse-temurin:11-jdk-noble /opt/java/openjdk /usr/lib/jvm/11
COPY --from=eclipse-temurin:17-jdk-noble /opt/java/openjdk /usr/lib/jvm/17
COPY --from=eclipse-temurin:21-jdk-noble /opt/java/openjdk /usr/lib/jvm/21
COPY --from=eclipse-temurin:25-jdk-noble /opt/java/openjdk /usr/lib/jvm/25
# Java 27 TODO: remove following two lines after GA

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LATEST_VERSION will be 27, so only line 66 is necessary (and similar for other instances in the rest of this file)

COPY --from=eclipse-temurin:26-jdk-noble /opt/java/openjdk /usr/lib/jvm/26
COPY --from=openjdk:27-ea-jdk-bookworm /usr/local/openjdk-27 /usr/lib/jvm/27
COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION}

COPY --from=azul/zulu-openjdk:8 /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8
Expand Down Expand Up @@ -127,7 +129,9 @@ 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
# Java 27 TODO: remove following two lines after GA
COPY --from=all-jdk /usr/lib/jvm/26 /usr/lib/jvm/26
COPY --from=all-jdk /usr/lib/jvm/27 /usr/lib/jvm/27
COPY --from=all-jdk /usr/lib/jvm/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION}

# Base image with minimum requirements to build the project.
Expand Down Expand Up @@ -233,7 +237,9 @@ 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
# Java 27 TODO: remove following two lines after GA
ENV JAVA_26_HOME=/usr/lib/jvm/26
ENV JAVA_27_HOME=/usr/lib/jvm/27
ENV JAVA_${LATEST_VERSION}_HOME=/usr/lib/jvm/${LATEST_VERSION}

ENV JAVA_HOME=${JAVA_8_HOME}
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Image variants are available on a per JDK basis:
- The `base` variant and its aliases — `8`, `11`, `17`, `21`, `25`, and `tip` — contain the base Eclipse Temurin JDK 8, 11, 17, 21, 25, and tip JDK version releases.
- The `zulu8`, `zulu11`, `oracle8`, `ibm8`, `semeru8`, `semeru11`, `semeru17`, `graalvm17`, `graalvm21`, and `graalvm25` variants each contain the base JDKs in addition to the specific JDK from their name.
- The `latest` variant contains the base JDKs and all of the specific JDKs above.
- EA JDK `27` is currently being tested. <!-- Java 27 TODO: remove this line after GA -->

All variants are published as multi-arch manifests covering `linux/amd64` and `linux/arm64`, so the same tag (e.g. `base`, `zulu8`, `tip`) resolves to the correct image for the host architecture.
The `7` and `ibm8` variants are amd64-only because the upstream JDK images are not available for arm64;
Expand Down
7 changes: 4 additions & 3 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -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 tip)
readonly BASE_VARIANTS=(8 11 17 21 25 27 tip) # Java 27 TODO: move tip to 27 after GA

readonly ALL_VARIANTS=(
7
Expand All @@ -22,7 +22,7 @@ readonly ALL_VARIANTS=(
# Variants whose upstream JDK images are not published for arm64.
readonly AMD64_ONLY_VARIANTS=(7 ibm8)

readonly LATEST_VERSION="26"
readonly LATEST_VERSION="26" # Java 27 TODO: update to 27 after GA
readonly PLATFORM="${PLATFORM:-linux/amd64}"
readonly DIGESTS_DIR="${DIGESTS_DIR:-./digests}"

Expand Down Expand Up @@ -210,7 +210,8 @@ function do_inner_test() {
"$JAVA_17_HOME/bin/java" -version
"$JAVA_21_HOME/bin/java" -version
"$JAVA_25_HOME/bin/java" -version
"$JAVA_26_HOME/bin/java" -version
"$JAVA_26_HOME/bin/java" -version # Java 27 TODO: delete after GA
"$JAVA_27_HOME/bin/java" -version # Java 27 TODO: delete after GA
"${!java_latest_home}/bin/java" -version
if [[ $variant != base && $variant != latest ]]; then
if [[ $variant == "tip" ]]; then
Expand Down
3 changes: 2 additions & 1 deletion scripts/delete-test-mirror-entries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ set -euo pipefail

readonly SOURCE_PREFIX="ghcr.io/datadog/dd-trace-java-docker-build"
readonly DEST_REPO="dd-trace-java-docker-build"
readonly CI_VARIANTS=(base 7 8 11 17 21 25 tip zulu8 zulu11 oracle8 ibm8 semeru8 semeru11 semeru17 graalvm17 graalvm21 graalvm25)
# Java 27 TODO: move tip to 27 after GA
readonly CI_VARIANTS=(base 7 8 11 17 21 25 27 tip zulu8 zulu11 oracle8 ibm8 semeru8 semeru11 semeru17 graalvm17 graalvm21 graalvm25)

if ! [[ "${PR_NUMBER}" =~ ^[0-9]+$ ]]; then
echo "::error::PR_NUMBER must be numeric (got: '${PR_NUMBER}')" >&2
Expand Down
3 changes: 2 additions & 1 deletion scripts/get-image-digests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

set -euo pipefail

readonly CI_VARIANTS=(base 7 8 11 17 21 25 tip zulu8 zulu11 oracle8 ibm8 semeru8 semeru11 semeru17 graalvm17 graalvm21 graalvm25)
# Java 27 TODO: move tip to 27 after GA
readonly CI_VARIANTS=(base 7 8 11 17 21 25 27 tip zulu8 zulu11 oracle8 ibm8 semeru8 semeru11 semeru17 graalvm17 graalvm21 graalvm25)

# update_digest TAG DIGEST FILE
# Finds the line "source: ...:TAG" and updates the digest on the following line.
Expand Down
Loading