# HG changeset patch
# User smith@nwoca.org
# Date 1493323042 -3600
# Node ID 151bd88f6c567384875907ce1316ef7984c2c54c
# Parent  a113282d940056fbb5b5a92e73a3a31755dbc953
DEP-12: update tomcat version and ms fonts installer

diff -r a113282d9400 -r 151bd88f6c56 tomcat/Dockerfile
--- a/tomcat/Dockerfile	Thu Apr 27 15:33:00 2017 -0400
+++ b/tomcat/Dockerfile	Thu Apr 27 20:57:22 2017 +0100
@@ -1,12 +1,16 @@
-FROM tomcat:8.5.5-jre8
+FROM tomcat:8.5.14-jre8
 
 MAINTAINER Dave Smith <smith@nwoca.org>
 
-RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \
-	&& echo 'deb http://httpredir.debian.org/debian jessie contrib' > /etc/apt/sources.list.d/jessie-contrib.list \
-    && apt-get update 									\
-    && apt-get install -y ttf-mscorefonts-installer
-
+RUN echo "deb http://httpredir.debian.org/debian jessie main contrib" > /etc/apt/sources.list \
+    && echo "deb http://security.debian.org/ jessie/updates main contrib" >> /etc/apt/sources.list \
+    && echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \
+    && apt-get update \
+    && apt-get install -y ttf-mscorefonts-installer \
+    && apt-get clean \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/*
+    
 WORKDIR /usr/local/tomcat
 
 COPY setenv.sh bin/
@@ -16,7 +20,3 @@
 	&& chmod +x bin/setenv.sh
 	
 ENV TZ=America/New_York
-
-ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:/usr/lib/x86_64-linux-gnu/
-
-RUN apt-get install -y libtcnative-1