Merge pull request #83 from paddy-hack/redo-base-url-support-to-use-ROOT

Redo base url support to use root
This commit is contained in:
arnaudroques 2018-12-03 12:26:30 +01:00 committed by GitHub
commit 731ea2ff87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -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=ROOT
COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war

View File

@ -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=ROOT
RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL
COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war