Merge branch 'master' of ssh://git.sdsys.ru:8022/labportal/admin

Dockerfile

@@ -4,6 +4,7 @@ COPY docker-entrypoint.sh \
      updatedb.sh \
      healthcheck.sh \
      laboratory.tar.gz \
+     dev-laboratory.tar.gz \
      /opt/
 COPY mongodb-org-3.6.repo /etc/yum.repos.d/
 ENV CATALINA_HOME="/opt/tomcat"
@@ -14,7 +15,7 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     WORKDIR=$CATALINA_HOME \
     DB_CLUSTER=mongodb \
     MONGODB=laboratory \
-    FB_HOST=fb3_demo \
+    FB_HOST=fb3_lab \
     FB_DATABASE=lab_99001 \
     REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan \
     APPNET=labnetwork

updatedb.sh

@@ -2,7 +2,7 @@
 
 # Проверяем наличие DB laboratory
 if [[ $(mongo --host ${DB_CLUSTER} --quiet --eval  "printjson(db.adminCommand('listDatabases'))"|grep -q "${MONGODB}";echo $?) -ne 0 ]];then
-  cd /tmp && tar xvf /opt/${MONGODB}.tar.gz
+  cd /tmp && tar xvf /opt/dev-${MONGODB}.tar.gz
   mongorestore --host ${DB_CLUSTER} -d ${MONGODB} ${MONGODB}
   if [[ $? -ne 0 ]]; then echo "Database ${MONGODB} is not restored!!!";rm -rf /tmp/${MONGODB};exit 1;fi
   rm -rf /tmp/${MONGODB}