From 38772dedd3c7c3f3761b1a27b69def902b7ea255 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Mon, 3 Dec 2018 18:30:47 +0900 Subject: [PATCH 1/2] Revert "Revert "Make the server's BASE_URL configurable"" This reverts commit 55012580875ef1e9e62abea75a5003866f4dc046. --- Dockerfile.jetty | 3 ++- Dockerfile.tomcat | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile.jetty b/Dockerfile.jetty index f1d939c..1a06a5b 100644 --- a/Dockerfile.jetty +++ b/Dockerfile.jetty @@ -21,4 +21,5 @@ USER jetty ENV GRAPHVIZ_DOT=/usr/bin/dot -COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war +ARG BASE_URL=plantuml +COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat index d0679ab..9024999 100644 --- a/Dockerfile.tomcat +++ b/Dockerfile.tomcat @@ -17,5 +17,6 @@ RUN apt-get update && \ ENV GRAPHVIZ_DOT=/usr/bin/dot -RUN rm -rf /usr/local/tomcat/webapps/ROOT -COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war +ARG BASE_URL=plantuml +RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL +COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war From 73c23724db99184f2b82e472bce206dd2b4e309b Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Mon, 3 Dec 2018 18:54:18 +0900 Subject: [PATCH 2/2] Use ROOT as the BASE_URL This fixes a misread of the README.md when preparing 055faca. --- Dockerfile.jetty | 2 +- Dockerfile.tomcat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.jetty b/Dockerfile.jetty index 1a06a5b..ea5a034 100644 --- a/Dockerfile.jetty +++ b/Dockerfile.jetty @@ -21,5 +21,5 @@ USER jetty ENV GRAPHVIZ_DOT=/usr/bin/dot -ARG BASE_URL=plantuml +ARG BASE_URL=ROOT COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat index 9024999..b4ffce9 100644 --- a/Dockerfile.tomcat +++ b/Dockerfile.tomcat @@ -17,6 +17,6 @@ RUN apt-get update && \ ENV GRAPHVIZ_DOT=/usr/bin/dot -ARG BASE_URL=plantuml +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