File tree 2 files changed +12
-3
lines changed
2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ RUN <<-EOT
56
56
EOT
57
57
58
58
FROM scratch AS default-jdk
59
- ARG LATEST_VERSION=24
59
+ ARG LATEST_VERSION
60
60
61
61
COPY --from=all-jdk /usr/lib/jvm/8 /usr/lib/jvm/8
62
62
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
67
67
# Base image with minimum requirements to build the project.
68
68
# Based on CircleCI Base Image with Ubuntu 22.04.3 LTS, present in most runners.
69
69
FROM cimg/base:current-22.04 AS base
70
- ARG LATEST_VERSION=24
70
+ ARG LATEST_VERSION
71
71
72
72
# https://docs.github.com/en/packages/learn-github-packages/connecting-a-repository-to-a-package
73
73
LABEL org.opencontainers.image.source=https://github.com/DataDog/dd-trace-java-docker-build
@@ -132,13 +132,15 @@ ENV PATH=${JAVA_HOME}/bin:${PATH}
132
132
FROM base AS variant
133
133
ARG VARIANT_LOWER
134
134
ARG VARIANT_UPPER
135
+ ARG LATEST_VERSION
135
136
136
137
COPY --from=all-jdk /usr/lib/jvm/${VARIANT_LOWER} /usr/lib/jvm/${VARIANT_LOWER}
137
138
ENV JAVA_${VARIANT_UPPER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
138
139
ENV JAVA_${VARIANT_LOWER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
139
140
140
141
# Full image for debugging, contains all JDKs.
141
142
FROM base AS full
143
+ ARG LATEST_VERSION
142
144
143
145
COPY --from=all-jdk /usr/lib/jvm/7 /usr/lib/jvm/7
144
146
COPY --from=all-jdk /usr/lib/jvm/zulu8 /usr/lib/jvm/zulu8
Original file line number Diff line number Diff line change @@ -173,6 +173,8 @@ function do_inner_test() {
173
173
function do_describe() {
174
174
local image
175
175
compute_metadata
176
+ compute_latest_version
177
+ docker_build full " $( image_name latest) "
176
178
image=" $( image_name latest) "
177
179
docker run \
178
180
--user " $( id -u) :$( id -g) " \
@@ -184,6 +186,7 @@ function do_describe() {
184
186
}
185
187
186
188
function do_inner_describe() {
189
+ compute_latest_version
187
190
echo " # Contents"
188
191
echo
189
192
echo " ## Operating System"
@@ -202,7 +205,11 @@ function do_inner_describe() {
202
205
echo " ## JDKs"
203
206
echo
204
207
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
206
213
env_upper=" JAVA_${variant_upper} _HOME"
207
214
echo " * $env_upper "
208
215
echo ' ```'
You can’t perform that action at this time.
0 commit comments