1
0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-22 08:48:54 +00:00

replace fonts to Google noto fonts

This commit is contained in:
translucens 2019-04-09 01:45:05 +09:00
parent 60b716d61b
commit f878c0ec22
No known key found for this signature in database
GPG Key ID: 452014CA45C17909
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 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
USER root
RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
apt-get clean
apt-get install -y --no-install-recommends graphviz fonts-noto-cjk && \
apt-get clean && rm -rf /var/lib/apt/lists/*
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 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
RUN apt-get update && \
apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
apt-get clean
apt-get install -y --no-install-recommends graphviz fonts-noto-cjk && \
apt-get clean && rm -rf /var/lib/apt/lists/*
ENV GRAPHVIZ_DOT=/usr/bin/dot