Skip to content

Commit 2f4a55f

Browse files
authored
Fix Ubuntu17 (#101)
1 parent bff20e0 commit 2f4a55f

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

Dockerfile

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,20 @@ COPY --from=all-jdk /usr/lib/jvm/${VARIANT_LOWER} /usr/lib/jvm/${VARIANT_LOWER}
183183
ENV JAVA_${VARIANT_UPPER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
184184
ENV JAVA_${VARIANT_LOWER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
185185

186+
FROM base AS ubuntu17
187+
188+
RUN set -eux;\
189+
sudo apt-get update; \
190+
sudo apt-get install -y openjdk-17-jdk; \
191+
sudo apt-get -y clean; \
192+
sudo rm -rf /var/lib/apt/lists/*;
193+
194+
USER non-root-user
195+
WORKDIR /home/non-root-user
196+
197+
ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
198+
ENV JAVA_ubuntu17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
199+
186200
# Full image for debugging, contains all JDKs.
187201
FROM base AS full
188202

@@ -200,6 +214,15 @@ COPY --from=all-jdk /usr/lib/jvm/semeru17 /usr/lib/jvm/semeru17
200214
COPY --from=all-jdk /usr/lib/jvm/graalvm17 /usr/lib/jvm/graalvm17
201215
COPY --from=all-jdk /usr/lib/jvm/graalvm21 /usr/lib/jvm/graalvm21
202216

217+
RUN set -eux;\
218+
sudo apt-get update; \
219+
sudo apt-get install -y openjdk-17-jdk; \
220+
sudo apt-get -y clean; \
221+
sudo rm -rf /var/lib/apt/lists/*;
222+
223+
ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
224+
ENV JAVA_ubuntu17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
225+
203226
ENV JAVA_7_HOME=/usr/lib/jvm/7
204227

205228
ENV JAVA_ZULU7_HOME=/usr/lib/jvm/7

build

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,13 @@ function do_build() {
102102
for variant in "${VARIANTS[@]}"; do
103103
variant_upper="${variant^^}"
104104
variant_lower="${variant,,}"
105-
docker_build variant "$(image_name "$variant_lower")" \
106-
--build-arg "VARIANT_UPPER=$variant_upper" \
107-
--build-arg "VARIANT_LOWER=$variant_lower"
105+
if [[ $variant == "ubuntu17" ]]; then
106+
docker_build ubuntu17 "$(image_name "${variant_lower}")"
107+
else
108+
docker_build variant "$(image_name "$variant_lower")" \
109+
--build-arg "VARIANT_UPPER=$variant_upper" \
110+
--build-arg "VARIANT_LOWER=$variant_lower"
111+
fi
108112
done
109113
}
110114

0 commit comments

Comments
 (0)