Merge pull request #92 from morotti/buildwar

fix travis build after #91

.travis.yml

@@ -28,21 +28,15 @@ jobs:
                   tags: true
         - stage: docker-push
           name: jetty
-          script: >
-              docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-              docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty . ;
-              docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest ;
-              docker push plantuml/plantuml-server:jetty;
-              docker push plantuml/plantuml-server:latest;
+          script:
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty .
+              - docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest
+              - docker push plantuml/plantuml-server:jetty
+              - docker push plantuml/plantuml-server:latest
         - stage: docker-push
           name: tomcat
-          script: >
-              docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-              docker build --pull -t plantuml/plantuml-server:tomcat -f Dockerfile.tomcat . ;
-              docker push plantuml/plantuml-server:tomcat;
-        - stage: docker-push
-          name: armv8a
-          script: >
-              docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
-              docker build --pull -t plantuml/plantuml-server:armv8a -f Dockerfile.armv8a . ;
-              docker push plantuml/plantuml-server:armv8a;
+          script:
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:tomcat -f Dockerfile.tomcat .
+              - docker push plantuml/plantuml-server:tomcat

Dockerfile.armv8a

@@ -1,20 +0,0 @@
-FROM arm64v8/ubuntu:16.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends maven openjdk-8-jdk 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
-
-# chmod required to ensure any user can run the app
-RUN mkdir /app/.m2 && chmod -R a+w /app
-EXPOSE 8080
-ENV HOME /app
-
-CMD java -Djetty.contextpath=/ -jar target/dependency/jetty-runner.jar target/plantuml.war
-
-# To run with debugging enabled instead
-#CMD java -Dorg.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog -Dorg.eclipse.jetty.LEVEL=DEBUG -Djetty.contextpath=/ -jar target/dependency/jetty-runner.jar target/plantuml.war

Dockerfile.jetty

@@ -1,4 +1,4 @@
-FROM maven:3-jdk-8 AS builder
+FROM maven:3-jdk-8 AS builderjetty
 
 COPY pom.xml /app/
 COPY src /app/src/
@@ -22,4 +22,4 @@ USER jetty
 ENV GRAPHVIZ_DOT=/usr/bin/dot
 
 ARG BASE_URL=ROOT
-COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war
+COPY --from=builderjetty /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war

Dockerfile.tomcat

@@ -1,4 +1,4 @@
-FROM maven:3-jdk-8 AS builder
+FROM maven:3-jdk-8 AS buildertomcat
 
 COPY pom.xml /app/
 COPY src /app/src/
@@ -19,4 +19,4 @@ ENV GRAPHVIZ_DOT=/usr/bin/dot
 
 ARG BASE_URL=ROOT
 RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL
-COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war
+COPY --from=buildertomcat /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war