Merge pull request plantuml#92 from morotti/buildwar

fix travis build after plantuml#91
HeinrichAD · Apr 1, 2019 · ba4ed86 · ba4ed86
2 parents 7138177 + 4c74a28
commit ba4ed86
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 40 deletions.
diff --git a/.travis.yml b/.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
diff --git a/Dockerfile.armv8a b/Dockerfile.armv8a
diff --git a/Dockerfile.jetty b/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
diff --git a/Dockerfile.tomcat b/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