comparison tomcat/Dockerfile @ 93:f6d96413673a

USASR-2388: merge
author smith@nwoca.org
date Thu, 13 Oct 2016 00:45:33 +0100
parents 120fc16ea511
children 151bd88f6c56
comparison
equal deleted inserted replaced
89:da49fcb26e2d 93:f6d96413673a
1 FROM tomcat:8.0.33-jre8 1 FROM tomcat:8.5.5-jre8
2 2
3 MAINTAINER Dave Smith <smith@nwoca.org> 3 MAINTAINER Dave Smith <smith@nwoca.org>
4 4
5 RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \ 5 RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections \
6 && echo 'deb http://httpredir.debian.org/debian jessie contrib' > /etc/apt/sources.list.d/jessie-contrib.list \ 6 && echo 'deb http://httpredir.debian.org/debian jessie contrib' > /etc/apt/sources.list.d/jessie-contrib.list \
8 && apt-get install -y ttf-mscorefonts-installer 8 && apt-get install -y ttf-mscorefonts-installer
9 9
10 WORKDIR /usr/local/tomcat 10 WORKDIR /usr/local/tomcat
11 11
12 COPY setenv.sh bin/ 12 COPY setenv.sh bin/
13 COPY tomcat-users.xml server.xml context.xml conf/ 13 COPY tomcat-users.xml server.xml context.xml logging.properties conf/
14 14
15 RUN rm -rf webapps/docs webapps/ROOT webapps/examples webapps/docs webapps/host-manager \ 15 RUN rm -rf webapps/docs webapps/ROOT webapps/examples webapps/docs webapps/host-manager \
16 && chmod +x bin/setenv.sh 16 && chmod +x bin/setenv.sh
17 17
18 ENV TZ=America/New_York 18 ENV TZ=America/New_York