version update and fixes

This commit is contained in:
Brian Long 2021-04-22 22:06:34 -04:00
parent 083658fb13
commit 34b5940bf7
3 changed files with 10 additions and 9 deletions

View File

@ -40,14 +40,14 @@ watchResources=/var/lib/tomcat/dev/classes; \
# This setting is dependent on application server plugin(Jetty, Tomcat, ...). # This setting is dependent on application server plugin(Jetty, Tomcat, ...).
# Jboss and Glassfish are not yet supported. # Jboss and Glassfish are not yet supported.
# Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp). # Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp).
webappDir=/var/lib/tomcat/dev/web; \ webappDir=/var/lib/tomcat/dev/web
/var/lib/tomcat/dev/web-extra1; \ #/var/lib/tomcat/dev/web-extra1; \
/var/lib/tomcat/dev/web-extra2; \ #/var/lib/tomcat/dev/web-extra2; \
/var/lib/tomcat/dev/web-extra3; \ #/var/lib/tomcat/dev/web-extra3; \
/var/lib/tomcat/dev/web-extra4; \ #/var/lib/tomcat/dev/web-extra4; \
/var/lib/tomcat/dev/web-extra5; \ #/var/lib/tomcat/dev/web-extra5; \
/var/lib/tomcat/dev/web-extra6; \ #/var/lib/tomcat/dev/web-extra6; \
/var/lib/tomcat/dev/web-extra7 #/var/lib/tomcat/dev/web-extra7
# Comma separated list of disabled plugins # Comma separated list of disabled plugins

View File

@ -14,7 +14,7 @@
<!-- The version of Apache Tomcat to serve as the basis of this Docker image --> <!-- The version of Apache Tomcat to serve as the basis of this Docker image -->
<!-- See: https://tomcat.apache.org/download-90.cgi --> <!-- See: https://tomcat.apache.org/download-90.cgi -->
<tomcat.version>9.0.44</tomcat.version> <tomcat.version>9.0.45</tomcat.version>
<tomcat.majorVersion>9</tomcat.majorVersion> <tomcat.majorVersion>9</tomcat.majorVersion>
<tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl> <tomcat.mirror.baseUrl>https://apache.osuosl.org/tomcat</tomcat.mirror.baseUrl>

View File

@ -1,2 +1,3 @@
#!/bin/sh #!/bin/sh
CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" CATALINA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}"
JAVA_OPTS=""