| 
														
															@@ -1,9 +1,9 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-FROM registry.sdsys.ru/iru/iru-base:0.1 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+FROM registry.sdsys.ru/iru/iru-base:0.3 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 ENTRYPOINT ["/tmp/docker-entrypoint.sh"] 
														 | 
														
														 | 
														
															 ENTRYPOINT ["/tmp/docker-entrypoint.sh"] 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 COPY docker-entrypoint.sh \ 
														 | 
														
														 | 
														
															 COPY docker-entrypoint.sh \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															      healthcheck.sh \ 
														 | 
														
														 | 
														
															      healthcheck.sh \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															      /tmp/ 
														 | 
														
														 | 
														
															      /tmp/ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-ENV CATALINA_HOME="/opt/tomcat"  
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ENV CATALINA_HOME="/opt/tomcat" 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 ENV PATH=$CATALINA_HOME/bin:$PATH \ 
														 | 
														
														 | 
														
															 ENV PATH=$CATALINA_HOME/bin:$PATH \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory/application.conf" \ 
														 | 
														
														 | 
														
															     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory/application.conf" \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     JAVA_HOME=/usr/java/default \ 
														 | 
														
														 | 
														
															     JAVA_HOME=/usr/java/default \ 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -16,13 +16,13 @@ EXPOSE 8090 9000 2551 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh 
														 | 
														
														 | 
														
															 HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 ARG repo=prod 
														 | 
														
														 | 
														
															 ARG repo=prod 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 ARG version=16.1 
														 | 
														
														 | 
														
															 ARG version=16.1 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-RUN set -x \            
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+RUN set -x \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && curl https://repo.infoclinica.ru/yum/centos/sds-${repo}-${version}.repo -o /etc/yum.repos.d/sds-${repo}-${version}.repo \ 
														 | 
														
														 | 
														
															            && curl https://repo.infoclinica.ru/yum/centos/sds-${repo}-${version}.repo -o /etc/yum.repos.d/sds-${repo}-${version}.repo \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && yum install iputils -y \ 
														 | 
														
														 | 
														
															            && yum install iputils -y \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && yum install tomcat-8.0.26-01 -y \ 
														 | 
														
														 | 
														
															            && yum install tomcat-8.0.26-01 -y \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && yum install web-laboratory -y \ 
														 | 
														
														 | 
														
															            && yum install web-laboratory -y \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && yum clean all \ 
														 | 
														
														 | 
														
															            && yum clean all \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-           && chmod +x /tmp/docker-entrypoint.sh \  
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+           && chmod +x /tmp/docker-entrypoint.sh \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && chmod +x /tmp/healthcheck.sh \ 
														 | 
														
														 | 
														
															            && chmod +x /tmp/healthcheck.sh \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && chown -R tomcat:tomcat /etc/web-laboratory \ 
														 | 
														
														 | 
														
															            && chown -R tomcat:tomcat /etc/web-laboratory \ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															            && cd /opt/tomcat/conf/web-laboratory/localhost \ 
														 | 
														
														 | 
														
															            && cd /opt/tomcat/conf/web-laboratory/localhost \ 
														 |