MALIO-DEV/PlantUmlServer
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use different container names for jetty and tomcat so they can be built in parallel without conflicting

Browse Source
This commit is contained in:
morotti
2019-03-31 23:51:41 +01:00
parent 0ec8cb68f4
commit 1b07c6d9c2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.jetty
View File

@@ -1,4 +1,4 @@
FROM maven:3-jdk-8 AS builder FROM maven:3-jdk-8 AS builderjetty
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@@ -22,4 +22,4 @@ USER jetty
ENV GRAPHVIZ_DOT=/usr/bin/dot ENV GRAPHVIZ_DOT=/usr/bin/dot
ARG BASE_URL=ROOT 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

4
Dockerfile.tomcat
View File

@@ -1,4 +1,4 @@
FROM maven:3-jdk-8 AS builder FROM maven:3-jdk-8 AS buildertomcat
COPY pom.xml /app/ COPY pom.xml /app/
COPY src /app/src/ COPY src /app/src/
@@ -19,4 +19,4 @@ ENV GRAPHVIZ_DOT=/usr/bin/dot
ARG BASE_URL=ROOT ARG BASE_URL=ROOT
RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL 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