Bump tomcat to 8.0.36

.dockerignore

@@ -0,0 +1 @@
+.git

Dockerfile

@@ -1,9 +1,12 @@
-FROM axiom/docker-tomcat:8.0
+FROM axiom/docker-tomcat:8.0.36
 MAINTAINER Kyle Wilcox <kyle@axiomdatascience.com>
 
 RUN \
     apt-get update && \
-    apt-get install -y unzip
+    apt-get install -y \
+        unzip && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # THREDDS
 ENV THREDDS_VERSION 4.6.5
@@ -23,9 +26,3 @@ COPY files/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.xml
 COPY files/javaopts.sh $CATALINA_HOME/bin/javaopts.sh
 
 RUN chown -R tomcat:tomcat "$CATALINA_HOME"
-
-COPY entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh"]
-
-EXPOSE 8080 8443
-CMD ["catalina.sh", "run"]

files/javaopts.sh

@@ -1,12 +1,11 @@
 #!/bin/sh
 
 NORMAL="-server -d64 -Xms4G -Xmx4G"
-MAX_PERM_GEN="-XX:MaxPermSize=256m"
 HEAP_DUMP="-XX:+HeapDumpOnOutOfMemoryError"
 HEADLESS="-Djava.awt.headless=true"
 
 CONTENT_ROOT="-Dtds.content.root.path=$CATALINA_HOME/content"
 JAVA_PREFS_SYSTEM_ROOT="-Djava.util.prefs.systemRoot=$CATALINA_HOME/content/thredds/javaUtilPrefs -Djava.util.prefs.userRoot=$CATALINA_HOME/content/thredds/javaUtilPrefs"
 
-JAVA_OPTS="$JAVA_OPTS $CONTENT_ROOT/ $JAVA_PREFS_SYSTEM_ROOT $NORMAL $MAX_PERM_GEN $HEAP_DUMP $HEADLESS"
+JAVA_OPTS="$JAVA_OPTS $CONTENT_ROOT/ $JAVA_PREFS_SYSTEM_ROOT $NORMAL $HEAP_DUMP $HEADLESS"
 export JAVA_OPTS