docker: more build file cleanup

Author: robyww

docker/base/Dockerfile

@@ -39,10 +39,14 @@ COPY launchTomcat.sh \
      start-examples.txt \
      setupSharedCacheJars.sh /usr/local/tomcat/
 
-# Make directories, make scripts executable, save old tomcat config files
+# Make directories, make scripts executable, save old tomcat config files, remove unwanted apps
 RUN chmod +x /usr/local/tomcat/launchTomcat.sh /usr/local/tomcat/setupSharedCacheJars.sh; \
     mv /usr/local/tomcat/conf/context.xml /usr/local/tomcat/conf/context.xml.bak; \
     mv /usr/local/tomcat/conf/tomcat-users.xml /usr/local/tomcat/conf/tomcat-users.xml.bak; \
+    rm -rf /usr/local/tomcat/webapps/examples \
+           /usr/local/tomcat/webapps/docs \
+           /usr/local/tomcat/webapps/host-manager \
+           /usr/local/tomcat/webapps/ROOT; \
     mkdir -p ${SERVER_CONFIG_DIR}; \
     mkdir -p ${FIREFLY_WORK_DIR}; \
     mkdir -p ${EXTERNAL_MOUNT_POINT}
@@ -73,14 +77,14 @@ EXPOSE 8080 5050 9050 7011
 # MIN_JVM_SIZE and MAX_JVM_SIZE should be used to set the min and max JVM side
 # at least MAX_JVM_SIZE should almost alway be used on the command line with 
 # parameter such as: -e "MAX_JVM_SIZE=4G"
-ENV MIN_JVM_SIZE=1g
+ENV MIN_JVM_SIZE=1G
 ENV MAX_JVM_SIZE=8G
 
 
 #User name and password to use admin
 ENV ADMIN_USER=admin
 ENV ADMIN_PASSWORD=replaceMe
-ENV DEBUG=true
+ENV DEBUG=false
 ENV MANAGER=true
 
 # if jvmRoute is not passed the hostname (the container id) is used

docker/base/launchTomcat.sh

@@ -38,7 +38,7 @@ echo "          Multi node sticky routing    jvmRoute             ${JVM_ROUTE}"
 echo "          Admin username               ADMIN_USER           ${ADMIN_USER}"
 echo "          Admin password               ADMIN_PASSWORD       ${ADMIN_PASSWORD}"
 echo "          Run tomcat with debug        DEBUG                ${DEBUG}"
-echo "          Run tomcat with debug        LOG_FILE_TO_CONSOLE  ${LOG_FILE_TO_CONSOLE}"
+echo "          An addition log file         LOG_FILE_TO_CONSOLE  ${LOG_FILE_TO_CONSOLE}"
 echo "          Tomcat Manager available     MANAGER              ${MANAGER}"
 echo "          Multi web app shared cache   SHARE_CACHE          ${SHARE_CACHE}"
 echo "          Extra firefly properties     FIREFLY_OPTS         ${FIREFLY_OPTS}"
@@ -80,12 +80,6 @@ if [ "$SHARE_CACHE" = "true" ] ||[ "$SHARE_CACHE" = "t" ] ||[ "$SHARE_CACHE" = "
    ./setupSharedCacheJars.sh
 fi
 
-
-rm -rf /usr/local/tomcat/webapps/examples
-rm -rf /usr/local/tomcat/webapps/docs
-rm -rf /usr/local/tomcat/webapps/host-manager
-rm -rf /usr/local/tomcat/webapps/ROOT
-
 if [ "$MANAGER" != "true" ] && [ "$MANAGER" != "t" ] && [ "$MANAGER" != "1" ] &&  \
    [ "$MANAGER" != "TRUE" ] && [ "$MANAGER" != "True" ] ; then
    rm -r /usr/local/tomcat/webapps/manager