Merge pull request #56 from Ducatel/master

Upgrade way to build docker image

.travis.yml

@@ -5,9 +5,6 @@ sudo: required
 services:
     - docker
 
-script:
-    - mvn package
-
 after_success:
   - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
   - if [ "$TRAVIS_BRANCH" == "master" ]; then
@@ -20,4 +17,7 @@ after_success:
     docker push plantuml/plantuml-server:jetty;
     docker push plantuml/plantuml-server:latest;
 
+    docker build -t plantuml/plantuml-server:armv8a -f Dockerfile.armv8a . ;
+    docker push plantuml/plantuml-server:armv8a;
+
     fi

Dockerfile.jetty

@@ -1,3 +1,16 @@
+FROM maven:3-jdk-8 AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/*
+
+COPY pom.xml /app/
+COPY src /app/src/
+
+ENV MAVEN_CONFIG=/app/.m2
+WORKDIR /app
+RUN mvn package
+
+########################################################################################
+
 FROM jetty
 MAINTAINER D.Ducatel
 
@@ -5,4 +18,6 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
     rm -rf /var/lib/apt/lists/*
 
-ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war
+COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war
+
+

Dockerfile.tomcat

@@ -1,3 +1,16 @@
+FROM maven:3-jdk-8 AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/*
+
+COPY pom.xml /app/
+COPY src /app/src/
+
+ENV MAVEN_CONFIG=/app/.m2
+WORKDIR /app
+RUN mvn package
+
+########################################################################################
+
 FROM tomcat:9
 MAINTAINER D.Ducatel
 
@@ -6,4 +19,4 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /usr/local/tomcat/webapps/ROOT
-ADD target/plantuml.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war