Update to use tomcat-docker:8.5

Author: kwilcox

.dockerignore

@@ -0,0 +1,3 @@
+.git
+.gitignore
+README.md

Dockerfile

@@ -1,4 +1,4 @@
-FROM unidata/tomcat-docker:latest
+FROM unidata/tomcat-docker:8.5
 MAINTAINER Kyle Wilcox <kyle@axiomdatascience.com>
 
 ENV ERDDAP_VERSION 1.82
@@ -25,10 +25,6 @@ COPY files/setenv.sh ${CATALINA_HOME}/bin/setenv.sh
 # ERDDAP setup.xml
 COPY files/setup.xml ${CATALINA_HOME}/content/erddap/setup.xml
 
-RUN mkdir -p ${ERDDAP_DATA} && \
-    chown -R tomcat:tomcat "${ERDDAP_DATA}" && \
-    chown -R tomcat:tomcat "${CATALINA_HOME}"
-
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
 

entrypoint.sh

@@ -7,6 +7,16 @@ set -e
 
 if [ "$1" = 'start-tomcat.sh' ] || [ "$1" = 'catalina.sh' ]; then
 
+    USER_ID=${TOMCAT_USER_ID:-1000}
+    GROUP_ID=${TOMCAT_GROUP_ID:-1000}
+
+    ###
+    # Tomcat user
+    ###
+    groupadd -r tomcat -g ${GROUP_ID} && \
+    useradd -u ${USER_ID} -g tomcat -d ${CATALINA_HOME} -s /sbin/nologin \
+        -c "Tomcat user" tomcat
+
     ###
     # Change CATALINA_HOME ownership to tomcat user and tomcat group
     # Restrict permissions on conf