Skip to content

Commit 44272b4

Browse files
committed
Fix describe
1 parent 408ee63 commit 44272b4

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Dockerfile

+4-2
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

+8-1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ function do_inner_test() {
173173
function do_describe() {
174174
local image
175175
compute_metadata
176+
compute_latest_version
177+
docker_build full "$(image_name latest)"
176178
image="$(image_name latest)"
177179
docker run \
178180
--user "$(id -u):$(id -g)" \
@@ -184,6 +186,7 @@ function do_describe() {
184186
}
185187

186188
function do_inner_describe() {
189+
compute_latest_version
187190
echo "# Contents"
188191
echo
189192
echo "## Operating System"
@@ -202,7 +205,11 @@ function do_inner_describe() {
202205
echo "## JDKs"
203206
echo
204207
for variant in "${BASE_VARIANTS[@]}" "${VARIANTS[@]}"; do
205-
variant_upper="${variant^^}"
208+
if [[ $variant == "latest" ]]; then
209+
variant_upper="${LATEST_VERSION}"
210+
else
211+
variant_upper="${variant^^}"
212+
fi
206213
env_upper="JAVA_${variant_upper}_HOME"
207214
echo "* $env_upper"
208215
echo '```'

0 commit comments

Comments
 (0)