Merge pull request plantuml#97 from translucens/replace-fonts

replace fonts to Google noto fonts
HeinrichAD · Apr 13, 2019 · 6deceeb · 6deceeb
2 parents ba4ed86 + db3b8f8
commit 6deceeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile.jetty b/Dockerfile.jetty
@@ -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
 

diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
@@ -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