1
0
mirror of https://github.com/octoleo/plantuml-server.git synced 2025-01-03 05:00:14 +00:00

Merge pull request #97 from translucens/replace-fonts

replace fonts to Google noto fonts
This commit is contained in:
arnaudroques 2019-04-13 22:03:53 +02:00 committed by GitHub
commit 7eba9632e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -1,4 +1,4 @@
FROM maven:3-jdk-8 AS builderjetty FROM maven:3.6-jdk-8-slim AS builderjetty
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@ -8,14 +8,14 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
######################################################################################## ########################################################################################
FROM jetty FROM jetty:9.4-jre8
MAINTAINER D.Ducatel MAINTAINER D.Ducatel
USER root USER root
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \ apt-get install -y --no-install-recommends graphviz fonts-noto-cjk && \
apt-get clean apt-get clean && rm -rf /var/lib/apt/lists/*
USER jetty USER jetty

View File

@ -1,4 +1,4 @@
FROM maven:3-jdk-8 AS buildertomcat FROM maven:3.6-jdk-8-slim AS buildertomcat
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@ -8,12 +8,12 @@ RUN mvn --batch-mode --define java.net.useSystemProxies=true package
######################################################################################## ########################################################################################
FROM tomcat:9 FROM tomcat:9.0-jre8-slim
MAINTAINER D.Ducatel MAINTAINER D.Ducatel
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \ apt-get install -y --no-install-recommends graphviz fonts-noto-cjk && \
apt-get clean apt-get clean && rm -rf /var/lib/apt/lists/*
ENV GRAPHVIZ_DOT=/usr/bin/dot ENV GRAPHVIZ_DOT=/usr/bin/dot