From 0ec8cb68f4c83454bb956a1efd79c9d41e121fca Mon Sep 17 00:00:00 2001 From: morotti Date: Sun, 31 Mar 2019 23:26:57 +0100 Subject: [PATCH 1/3] fix travis: script should be an array of strings --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0e09af..dcf4014 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,21 +28,21 @@ 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; + 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:armv8a -f Dockerfile.armv8a . + - docker push plantuml/plantuml-server:armv8a From 1b07c6d9c25bd774063f58897d7bc3ffef6f59f2 Mon Sep 17 00:00:00 2001 From: morotti Date: Sun, 31 Mar 2019 23:51:41 +0100 Subject: [PATCH 2/3] use different container names for jetty and tomcat so they can be built in parallel without conflicting --- Dockerfile.jetty | 4 ++-- Dockerfile.tomcat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.jetty b/Dockerfile.jetty index ea5a034..f5c5520 100644 --- 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 index b4ffce9..ec25f45 100644 --- 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 From 978a20348713830a2d258c48eaabbacee3676cdb Mon Sep 17 00:00:00 2001 From: morotti Date: Sun, 31 Mar 2019 23:57:54 +0100 Subject: [PATCH 3/3] remove armv8a docker build. it doesn't work. looks like it never worked and no docker image was ever pushed to the docker registry. failing commands were ignored silently by travis. --- .travis.yml | 6 ------ Dockerfile.armv8a | 20 -------------------- 2 files changed, 26 deletions(-) delete mode 100644 Dockerfile.armv8a diff --git a/.travis.yml b/.travis.yml index dcf4014..79b69e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,3 @@ jobs: - 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 diff --git a/Dockerfile.armv8a b/Dockerfile.armv8a deleted file mode 100644 index a323926..0000000 --- a/Dockerfile.armv8a +++ /dev/null @@ -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