# HG changeset patch # User belknapSSDT # Date 1716475723 14400 # Node ID 67c28d5e790425d221b9d189d0a78a4894e9cb0d # Parent eb70cc84cfb0acfe95ed5f9403a6e4650940f7c3 update file name, add arg diff -r eb70cc84cfb0 -r 67c28d5e7904 tomcat-17/Dockerfile --- a/tomcat-17/Dockerfile Thu May 23 10:11:12 2024 -0400 +++ b/tomcat-17/Dockerfile Thu May 23 10:48:43 2024 -0400 @@ -30,10 +30,10 @@ WORKDIR /usr/local/tomcat -COPY setenv.sh bin/ +COPY setenv17.sh bin/ COPY tomcat-users.xml server.xml context.xml logging.properties conf/ RUN rm -rf webapps/docs webapps/ROOT webapps/examples webapps/docs webapps/host-manager \ - && chmod +x bin/setenv.sh + && chmod +x bin/setenv17.sh ENV TZ=America/New_York diff -r eb70cc84cfb0 -r 67c28d5e7904 tomcat-17/setenv.sh --- a/tomcat-17/setenv.sh Thu May 23 10:11:12 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -#! /bin/sh -# -echo "__________________________________________" - -export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseG1GC" -export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseStringDeduplication " -export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom" -export CATALINA_OPTS="$CATALINA_OPTS -Duser.language=en" -export CATALINA_OPTS="$CATALINA_OPTS -Duser.region=US" - -echo "Using CATALINA_OPTS $CATALINA_OPTS" -echo "Using JAVA_OPTS $JAVA_OPTS" -echo "_________________________________________" -echo "" diff -r eb70cc84cfb0 -r 67c28d5e7904 tomcat-17/setenv17.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tomcat-17/setenv17.sh Thu May 23 10:48:43 2024 -0400 @@ -0,0 +1,14 @@ +#! /bin/sh +# +echo "__________________________________________" + +export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseG1GC" +export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseStringDeduplication " +export CATALINA_OPTS="$CATALINA_OPTS -Djava.security.egd=file:/dev/./urandom" +export CATALINA_OPTS="$CATALINA_OPTS -Duser.language=en" +export CATALINA_OPTS="$CATALINA_OPTS -Duser.region=US" + +echo "Using CATALINA_OPTS $CATALINA_OPTS" +echo "Using JAVA_OPTS $JAVA_OPTS" +echo "_________________________________________" +echo ""