From de5bc4b5875b45d1c626661339d9cc563358f8cc Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Fri, 19 Dec 2025 09:38:38 -0800 Subject: [PATCH 1/2] cadc-tomcat: remove static ROOT document use of war-rename to deploy a service at / --- cadc-tomcat/Dockerfile | 5 ----- cadc-tomcat/README.md | 9 ++++++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cadc-tomcat/Dockerfile b/cadc-tomcat/Dockerfile index 693de1f..2b391fb 100644 --- a/cadc-tomcat/Dockerfile +++ b/cadc-tomcat/Dockerfile @@ -46,11 +46,6 @@ RUN echo JAVA_OPTS=\"-Xms512m -Xmx2048m -XX:+UseParallelGC \$JAVA_OPTS\" >> /etc # disable all jar scanning for TLDs RUN echo "tomcat.util.scan.StandardJarScanFilter.jarsToSkip=*.jar" >> /etc/tomcat/catalina.properties -# standard welcome page -RUN mkdir -p /usr/share/tomcat/webapps/ROOT -COPY src/index.html /usr/share/tomcat/webapps/ROOT/ -RUN chown -R tomcat.tomcat /usr/share/tomcat/webapps/ROOT - COPY src/cadc-tomcat-start /usr/bin/cadc-tomcat-start CMD ["/usr/bin/cadc-tomcat-start"] diff --git a/cadc-tomcat/README.md b/cadc-tomcat/README.md index 728678f..4c043fe 100644 --- a/cadc-tomcat/README.md +++ b/cadc-tomcat/README.md @@ -77,7 +77,14 @@ discover it from the request for this to work. Some applications may not be _mov Renaming the war file can take advantage of some tomcat war file naming conventions (https://tomcat.apache.org/tomcat-9.0-doc/config/context.html), for example: to rename -the context or introduce additional path elements. +the context or introduce additional path elements: +``` +mv foo.war api#foo.war +``` +To deploy a service on the root of the server, take advantage of this special tomcat name: +``` +mv foo.war ROOT.war +``` ### tomcat.conf This optional file contains configuration used by the tomcat startup, e.g.: From b9ad516665b6ded38df6921aae0ba8f61d6fa444 Mon Sep 17 00:00:00 2001 From: Patrick Dowler Date: Fri, 19 Dec 2025 09:48:18 -0800 Subject: [PATCH 2/2] improve README --- cadc-tomcat/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cadc-tomcat/README.md b/cadc-tomcat/README.md index 4c043fe..ec2b6b3 100644 --- a/cadc-tomcat/README.md +++ b/cadc-tomcat/README.md @@ -81,6 +81,8 @@ the context or introduce additional path elements: ``` mv foo.war api#foo.war ``` +to deploy as `/api/foo`. + To deploy a service on the root of the server, take advantage of this special tomcat name: ``` mv foo.war ROOT.war