Revert "Fix Ubuntu17 (#101)" (#104)

This reverts commit 2f4a55f.

Author: smola

Dockerfile

@@ -183,20 +183,6 @@ COPY --from=all-jdk /usr/lib/jvm/${VARIANT_LOWER} /usr/lib/jvm/${VARIANT_LOWER}
 ENV JAVA_${VARIANT_UPPER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
 ENV JAVA_${VARIANT_LOWER}_HOME=/usr/lib/jvm/${VARIANT_LOWER}
 
-FROM base AS ubuntu17
-
-RUN set -eux;\
-  sudo apt-get update; \
-  sudo apt-get install -y openjdk-17-jdk; \
-  sudo apt-get -y clean; \
-  sudo rm -rf /var/lib/apt/lists/*;
-
-USER non-root-user
-WORKDIR /home/non-root-user
-
-ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-ENV JAVA_ubuntu17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-
 # Full image for debugging, contains all JDKs.
 FROM base AS full
 
@@ -214,15 +200,6 @@ COPY --from=all-jdk /usr/lib/jvm/semeru17 /usr/lib/jvm/semeru17
 COPY --from=all-jdk /usr/lib/jvm/graalvm17 /usr/lib/jvm/graalvm17
 COPY --from=all-jdk /usr/lib/jvm/graalvm21 /usr/lib/jvm/graalvm21
 
-RUN set -eux;\
-  sudo apt-get update; \
-  sudo apt-get install -y openjdk-17-jdk; \
-  sudo apt-get -y clean; \
-  sudo rm -rf /var/lib/apt/lists/*;
-
-ENV JAVA_UBUNTU17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-ENV JAVA_ubuntu17_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-
 ENV JAVA_7_HOME=/usr/lib/jvm/7
 
 ENV JAVA_ZULU7_HOME=/usr/lib/jvm/7

build

@@ -102,13 +102,9 @@ function do_build() {
     for variant in "${VARIANTS[@]}"; do
         variant_upper="${variant^^}"
         variant_lower="${variant,,}"
-        if [[ $variant == "ubuntu17" ]]; then
-            docker_build ubuntu17 "$(image_name "${variant_lower}")"
-        else
-            docker_build variant "$(image_name "$variant_lower")" \
-                --build-arg "VARIANT_UPPER=$variant_upper" \
-                --build-arg "VARIANT_LOWER=$variant_lower"
-        fi
+        docker_build variant "$(image_name "$variant_lower")" \
+            --build-arg "VARIANT_UPPER=$variant_upper" \
+            --build-arg "VARIANT_LOWER=$variant_lower"
     done
 }