Skip to content

Commit 4f2146f

Browse files
committed
Fix describe pt 1
1 parent 408ee63 commit 4f2146f

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN <<-EOT
5656
EOT
5757

5858
FROM scratch AS default-jdk
59-
ARG LATEST_VERSION=24
59+
ARG LATEST_VERSION
6060

6161
COPY --from=all-jdk /usr/lib/jvm/8 /usr/lib/jvm/8
6262
COPY --from=all-jdk /usr/lib/jvm/11 /usr/lib/jvm/11
@@ -67,7 +67,7 @@ COPY --from=all-jdk /usr/lib/jvm/${LATEST_VERSION} /usr/lib/jvm/${LATEST_VERSION
6767
# Base image with minimum requirements to build the project.
6868
# Based on CircleCI Base Image with Ubuntu 22.04.3 LTS, present in most runners.
6969
FROM cimg/base:current-22.04 AS base
70-
ARG LATEST_VERSION=24
70+
ARG LATEST_VERSION
7171

7272
# https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
7373
LABEL org.opencontainers.image.source=https://github.com/DataDog/dd-trace-java-docker-build
@@ -132,13 +132,15 @@ ENV PATH=${JAVA_HOME}/bin:${PATH}
132132
FROM base AS variant
133133
ARG VARIANT_LOWER
134134
ARG VARIANT_UPPER
135+
ARG LATEST_VERSION
135136

136137
COPY --from=all-jdk /usr/lib/jvm/${VARIANT_LOWER} /usr/lib/jvm/${VARIANT_LOWER}
137138
ENV JAVA_${VARIANT_UPPER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
138139
ENV JAVA_${VARIANT_LOWER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
139140

140141
# Full image for debugging, contains all JDKs.
141142
FROM base AS full
143+
ARG LATEST_VERSION
142144

143145
COPY --from=all-jdk /usr/lib/jvm/7 /usr/lib/jvm/7
144146
COPY --from=all-jdk /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8

build

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ function do_describe() {
184184
}
185185

186186
function do_inner_describe() {
187+
compute_latest_version
187188
echo "# Contents"
188189
echo
189190
echo "## Operating System"
@@ -202,7 +203,11 @@ function do_inner_describe() {
202203
echo "## JDKs"
203204
echo
204205
for variant in "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
205-
variant_upper="${variant^^}"
206+
if [[ $variant == "latest" ]]; then
207+
variant_upper="${LATEST_VERSION}"
208+
else
209+
variant_upper="${variant^^}"
210+
fi
206211
env_upper="JAVA_${variant_upper}_HOME"
207212
echo "* $env_upper"
208213
echo '```'

0 commit comments

Comments
 (0)