Mercurial > public > ssdt-docker
diff tomcat/Dockerfile @ 163:daf91a3bbee5 production v1.2.0
flow: Merged <release> 'v1.2.0' to <master> ('production').
author | smith@nwoca.org |
---|---|
date | Tue, 15 Aug 2017 21:59:23 +0100 |
parents | 2f794158e9e8 |
children | 1866c261576f |
line wrap: on
line diff
--- a/tomcat/Dockerfile Fri Jun 16 17:14:15 2017 +0100 +++ b/tomcat/Dockerfile Tue Aug 15 21:59:23 2017 +0100 @@ -1,11 +1,21 @@ -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/* + +RUN apt-get update \ + && apt-get install -y postgresql-client \ + && apt-get clean \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* WORKDIR /usr/local/tomcat @@ -16,7 +26,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