Skip to content
Closed
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `stable`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, and latest stable JDK versions,
- The `base` variant, and its aliases `8`, `11`, `17`, `21`, and `latest_non_lts`, contains the base Eclipse Temurin JDK 8, 11, 17, 21, and latest non-LTS 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.

Expand Down
6 changes: 3 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 stable) # add an ea variant once the early access build is available
readonly BASE_VARIANTS=(8 11 17 21 latest_non_lts) # add an ea variant once the early access build is available

readonly VARIANTS=(
7
Expand Down Expand Up @@ -160,7 +160,7 @@ function do_inner_test() {
"$JAVA_21_HOME/bin/java" -version
"${!java_latest_home}/bin/java" -version
if [[ $variant != base && $variant != latest ]]; then
if [[ $variant == "stable" ]]; then
if [[ $variant == "latest_non_lts" ]]; then
variant_lower="${LATEST_VERSION}"
variant_upper="${LATEST_VERSION}"
fi
Expand Down Expand Up @@ -202,7 +202,7 @@ function do_inner_describe() {
echo "## JDKs"
echo
for variant in "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
if [[ $variant == "stable" ]]; then
if [[ $variant == "latest_non_lts" ]]; then
variant_upper="${LATEST_VERSION}"
else
variant_upper="${variant^^}"
Expand Down