cleaner

Dockerfile

@@ -1,5 +1,5 @@
-FROM adoptopenjdk:15-hotspot-bionic AS build
-ARG PLANTUML_VERSION=1.2021.0
+FROM adoptopenjdk:15-hotspot-focal AS build
+ARG PLANTUML_VERSION=1.2021.1
 ENV PLANTUML_URL="https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION}.jar"
 RUN apt-get -qq update \
     && apt-get -qqy install wget binutils \
@@ -9,7 +9,7 @@ RUN apt-get -qq update \
          --output /opt/customjre
 
 FROM ubuntu:20.04
-ARG PLANTUML_VERSION=1.2021.0
+ARG PLANTUML_VERSION=1.2021.1
 ADD plantuml /usr/local/bin/plantuml
 ADD requirements.txt /tmp/requirements.txt
 COPY --from=build /opt/customjre /opt/customjre

Dockerfile.old

@@ -1,21 +1,21 @@
-FROM squidfunk/mkdocs-material:latest AS BUILD
-ARG PLANTUML_VERSION=1.2020.15
-ARG JDK_URL=https://cdn.azul.com/zulu/bin/zulu14.29.23-ca-jdk14.0.2-linux_musl_x64.tar.gz
+ARG PLANTUML_VERSION=1.2021.1
+ARG MKDOCS_MATERIAL_VERSION=7.1.0
+
+FROM adoptopenjdk/openjdk16:alpine AS BUILD
+ARG PLANTUML_VERSION=1.2021.1
 ENV PLANTUML_URL="https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION}.jar"
-RUN apk add --no-cache wget \
-    && mkdir -p /opt/jdk \
-    && wget -qO- "${JDK_URL}" | tar -xz -f- --strip-components=1 -C /opt/jdk \
+RUN apk add --no-cache wget binutils \
     && wget -q -O /usr/local/lib/plantuml.jar "${PLANTUML_URL}" \
-    && /opt/jdk/bin/jlink --no-header-files --no-man-pages --compress=2 --strip-debug \
-         --add-modules $(/opt/jdk/bin/jdeps --print-module-deps /usr/local/lib/plantuml.jar) \
+    && /opt/java/openjdk/bin/jlink --no-header-files --no-man-pages --compress=2 --strip-debug \
+         --add-modules $(/opt/java/openjdk/bin/jdeps --ignore-missing-deps --print-module-deps /usr/local/lib/plantuml.jar) \
          --output /opt/customjre
 
-FROM squidfunk/mkdocs-material:latest
+FROM squidfunk/mkdocs-material:$MKDOCS_MATERIAL_VERSION
 ADD plantuml /usr/local/bin/plantuml
 RUN pip install --no-cache-dir plantuml-markdown
 COPY --from=BUILD /opt/customjre /opt/jre
 COPY --from=BUILD /usr/local/lib/plantuml.jar /usr/local/lib/plantuml.jar
-ENV PATH=/opt/customjre/bin
+ENV PATH=/opt/jre/bin:$PATH
 
 # https://github.com/AdoptOpenJDK/openjdk-docker/issues/75
 RUN apk add --no-cache fontconfig ttf-dejavu

requirements.txt

@@ -1,6 +1,6 @@
 mkdocs==1.1.2
-mkdocs-material==6.2.4
+mkdocs-material==7.0.3
 plantuml-markdown==3.4.2
-mkdocs-minify-plugin==0.3.0
+mkdocs-minify-plugin==0.4.0
 mkdocs-git-revision-date-localized-plugin==0.8
 mkdocs-awesome-pages-plugin==2.5.0