From 1b07c6d9c25bd774063f58897d7bc3ffef6f59f2 Mon Sep 17 00:00:00 2001 From: morotti Date: Sun, 31 Mar 2019 23:51:41 +0100 Subject: [PATCH] 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