diff --git a/Dockerfile b/Dockerfile index 6df96d8..c706422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,10 @@ -ARG MKDOCS_MATERIAL_VERSION=8.1.3 - -FROM openjdk:18-alpine AS BUILD -ARG PLANTUML_VERSION=1.2021.16 -ENV PLANTUML_URL="https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION}.jar" -RUN apk add --no-cache wget binutils \ - && wget -q -O /usr/local/lib/plantuml.jar "${PLANTUML_URL}" \ - && jlink --no-header-files --no-man-pages --compress=2 --strip-debug \ - --add-modules $(jdeps --ignore-missing-deps --print-module-deps /usr/local/lib/plantuml.jar) \ - --output /opt/customjre +ARG MKDOCS_MATERIAL_VERSION=8.3.9 FROM squidfunk/mkdocs-material:$MKDOCS_MATERIAL_VERSION -RUN apk add --no-cache fontconfig ttf-dejavu +RUN apk add --no-cache gcompat libstdc++ fontconfig ttf-dejavu ttf-liberation ADD plantuml /usr/local/bin/plantuml +RUN wget -q -O /usr/local/bin/plantuml https://github.com/mikaelhg/puni2/releases/download/1.2022.6/plantuml-1.2022.6-glibc-x86_64 \ + && chmod 755 /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/jre/bin:$PATH CMD [ "build" ]