Mercurial > public > ssdt-docker

diff tomcat/Dockerfile @ 107:dc3696525de4 feature/djs-DEP-12-docker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from default
author smith@nwoca.org
date Fri, 21 Apr 2017 17:17:24 +0100
parents 120fc16ea511
children 151bd88f6c56
line wrap: on
line diff
--- a/tomcat/Dockerfile	Fri Apr 21 17:16:35 2017 +0100
+++ b/tomcat/Dockerfile	Fri Apr 21 17:17:24 2017 +0100
@@ -1,4 +1,4 @@
-FROM tomcat:8.0.33-jre8
+FROM tomcat:8.5.5-jre8
 
 MAINTAINER Dave Smith <smith@nwoca.org>
 
@@ -10,7 +10,7 @@
 WORKDIR /usr/local/tomcat
 
 COPY setenv.sh bin/
-COPY tomcat-users.xml server.xml context.xml conf/
+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
@@ -19,4 +19,4 @@
 
 ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/
 
-RUN apt-get install -y libtcnative-1
\ No newline at end of file
+RUN apt-get install -y libtcnative-1