@@ -73,21 +73,6 @@ RUN <<-EOT
73
73
sudo curl -L --fail "https://javadl.oracle.com/webapps/download/AutoDL?BundleId=248746_8c876547113c4e4aab3c868e9e0ec572" | sudo tar -xvzf - -C /usr/lib/jvm/oracle8 --strip-components 1
74
74
EOT
75
75
76
- # Install Ubuntu's OpenJDK 17 and fix broken symlinks:
77
- # some files in /usr/lib/jvm/ubuntu17 are symlinks to /etc/java-17-openjdk/, so we just copy all symlinks targets.
78
- RUN <<-EOT
79
- set -eux
80
- sudo apt-get update
81
- sudo apt-get install -y openjdk-17-jdk
82
- sudo mv /usr/lib/jvm/java-17-openjdk-amd64 /usr/lib/jvm/ubuntu17
83
- sudo mkdir -p /usr/lib/jvm/ubuntu17/conf/ /usr/lib/jvm/ubuntu17/lib/
84
- sudo cp -rf --remove-destination /etc/java-17-openjdk/* /usr/lib/jvm/ubuntu17/conf/
85
- sudo cp -rf --remove-destination /etc/java-17-openjdk/* /usr/lib/jvm/ubuntu17/lib/
86
- sudo cp -f --remove-destination /etc/java-17-openjdk/jvm-amd64.cfg /usr/lib/jvm/ubuntu17/lib/
87
- sudo apt-get clean
88
- sudo rm -rf /var/lib/apt/lists/*
89
- EOT
90
-
91
76
# Remove cruft from JDKs that is not used in the build process.
92
77
RUN <<-EOT
93
78
sudo rm -rf \
@@ -212,7 +197,6 @@ COPY --from=all-jdk /usr/lib/jvm/ibm8 /usr/lib/jvm/ibm8
212
197
COPY --from=all-jdk /usr/lib/jvm/semeru8 /usr/lib/jvm/semeru8
213
198
COPY --from=all-jdk /usr/lib/jvm/semeru11 /usr/lib/jvm/semeru11
214
199
COPY --from=all-jdk /usr/lib/jvm/semeru17 /usr/lib/jvm/semeru17
215
- COPY --from=all-jdk /usr/lib/jvm/ubuntu17 /usr/lib/jvm/ubuntu17
216
200
COPY --from=all-jdk /usr/lib/jvm/graalvm17 /usr/lib/jvm/graalvm17
217
201
COPY --from=all-jdk /usr/lib/jvm/graalvm21 /usr/lib/jvm/graalvm21
218
202
@@ -233,7 +217,5 @@ ENV JAVA_SEMERU8_HOME=/usr/lib/jvm/semeru8
233
217
ENV JAVA_SEMERU11_HOME=/usr/lib/jvm/semeru11
234
218
ENV JAVA_SEMERU17_HOME=/usr/lib/jvm/semeru17
235
219
236
- ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/ubuntu17
237
-
238
220
ENV JAVA_GRAALVM17_HOME=/usr/lib/jvm/graalvm17
239
221
ENV JAVA_GRAALVM21_HOME=/usr/lib/jvm/graalvm21
0 commit comments