Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cadc-tomcat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

11 changes: 10 additions & 1 deletion cadc-tomcat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,16 @@ 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 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
```

### tomcat.conf
This optional file contains configuration used by the tomcat startup, e.g.:
Expand Down