|
|
@@ -1,8 +1,8 @@
|
|
|
-FROM registry.sdsys.ru/iru/iru-base:0.1
|
|
|
+FROM registry.sdsys.ru/iru/iru-base:0.4
|
|
|
ENTRYPOINT ["docker-entrypoint.sh"]
|
|
|
COPY docker-entrypoint.sh healthcheck.sh /opt/tomcat8/bin/
|
|
|
|
|
|
-ENV CATALINA_HOME="/opt/tomcat8"
|
|
|
+ENV CATALINA_HOME="/opt/tomcat8"
|
|
|
ENV PATH=$CATALINA_HOME/bin:$PATH \
|
|
|
CATALINA_OPTS="-Dconfig.file=/etc/web-infoclinic/application.conf" \
|
|
|
JAVA_HOME=/usr/java/default \
|
|
|
@@ -20,7 +20,7 @@ RUN set -x \
|
|
|
&& chmod +x /opt/tomcat8/bin/docker-entrypoint.sh \
|
|
|
&& chmod +x /opt/tomcat8/bin/healthcheck.sh \
|
|
|
&& chown -R tomcat:tomcat /etc/web-infoclinic
|
|
|
-
|
|
|
+
|
|
|
COPY logging.properties /opt/tomcat8/conf/
|
|
|
RUN set -eux; \
|
|
|
localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
|
