|
@@ -1,7 +1,7 @@
|
|
|
FROM registry.sdsys.ru/iru/iru-base:0.1
|
|
FROM registry.sdsys.ru/iru/iru-base:0.1
|
|
|
ENTRYPOINT ["docker-entrypoint.sh"]
|
|
ENTRYPOINT ["docker-entrypoint.sh"]
|
|
|
COPY docker-entrypoint.sh healthcheck.sh /opt/tomcat8/bin/
|
|
COPY docker-entrypoint.sh healthcheck.sh /opt/tomcat8/bin/
|
|
|
-#COPY logging.properties /opt/tomcat8/conf/
|
|
|
|
|
|
|
+
|
|
|
ENV CATALINA_HOME="/opt/tomcat8"
|
|
ENV CATALINA_HOME="/opt/tomcat8"
|
|
|
ENV PATH=$CATALINA_HOME/bin:$PATH \
|
|
ENV PATH=$CATALINA_HOME/bin:$PATH \
|
|
|
CATALINA_OPTS="-Dconfig.file=/etc/web-infoclinic/application.conf" \
|
|
CATALINA_OPTS="-Dconfig.file=/etc/web-infoclinic/application.conf" \
|
|
@@ -21,6 +21,6 @@ RUN set -x \
|
|
|
&& chmod +x /opt/tomcat8/bin/healthcheck.sh \
|
|
&& chmod +x /opt/tomcat8/bin/healthcheck.sh \
|
|
|
&& chown -R tomcat:tomcat /etc/web-infoclinic
|
|
&& chown -R tomcat:tomcat /etc/web-infoclinic
|
|
|
|
|
|
|
|
-COPY logging.properties /opt/tomcat8/conf/
|
|
|
|
|
|
|
+#COPY logging.properties /opt/tomcat8/conf/
|
|
|
USER tomcat
|
|
USER tomcat
|
|
|
CMD ["catalina.sh", "run"]
|
|
CMD ["catalina.sh", "run"]
|
