Browse Source

Cut out mongo database initiation with default data

Vadim Surkov 5 years ago
parent
commit
b4e3ca6501
7 changed files with 1 additions and 47 deletions
  1. 0 9
      Dockerfile
  2. BIN
      dev-laboratory.tar.gz
  3. 0 3
      docker-entrypoint.sh
  4. 1 4
      healthcheck.sh
  5. BIN
      laboratory.tar.gz
  6. 0 6
      mongodb-org-3.6.repo
  7. 0 25
      updatedb.sh

+ 0 - 9
Dockerfile

@@ -1,12 +1,8 @@
 FROM registry.sdsys.ru/iru/iru-base:0.4
 ENTRYPOINT ["/opt/docker-entrypoint.sh"]
 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"
 ENV PATH=$CATALINA_HOME/bin:$PATH \
     CATALINA_OPTS="-Dconfig.file=/etc/web-laboratory-admin/application.conf" \
@@ -14,10 +10,6 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
     WORKDIR=$CATALINA_HOME \
     DB_CLUSTER=mongodb \
-    MONGODB=laboratory \
-    FB_HOST=fb3_lab \
-    FB_DATABASE=lab_99001 \
-    REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan \
     APPNET=labnetwork
 EXPOSE 8091 8080 8009 2551
 HEALTHCHECK --start-period=300s --interval=15s --timeout=5s --retries=2 CMD /opt/healthcheck.sh
@@ -28,7 +20,6 @@ RUN set -x \
            && yum install tomcat-8.0.26-01 -y \
            && yum install iputils telnet nc -y \
            && yum install web-laboratory-admin -y \
-           && yum install mongodb-org-shell mongodb-org-tools -y \
            && yum clean all \
            && rm -rf /var/cache/yum \
            && chmod +x /opt/docker-entrypoint.sh \

BIN
dev-laboratory.tar.gz


+ 0 - 3
docker-entrypoint.sh

@@ -8,9 +8,6 @@ while [ $? -ne 0 ]; do
   nslookup ${HOSTNAME}.${APPNET}
 done
 
-/opt/updatedb.sh
-if [[ $? -ne 0 ]]; then echo "An error occurred while updating the database ${MONGODB}"; exit 1;fi
-
 sed -i "s/\${DB_CLUSTER}/\"${DB_CLUSTER}\"/" /etc/web-laboratory-admin/application.conf
 
 sed -i "s/ADMINHOST/$(dig ${HOSTNAME}.${APPNET} +short)/" /etc/web-laboratory-admin/application.conf

+ 1 - 4
healthcheck.sh

@@ -3,12 +3,9 @@
 containerstart=`stat -c %Z /proc/1`
 curtime=`date +%s`
 if (( curtime-containerstart < 180 )); then
-    while ! mongo --host "${DB_CLUSTER}" --eval "db.runCommand( { connectionStatus: 1 } )"; do echo "Waiting for ${DB_CLUSTER} to be available"; sleep 1; done
+    while ! ping -c 1 ${DB_CLUSTER}; do echo "Waiting for ${DB_CLUSTER} to be available"; sleep 1; done
     echo "0"
     exit 0
 fi
 
 curl -f 127.0.0.1:8091/login || exit 1
-
-/opt/updatedb.sh
-if [[ $? -ne 0 ]]; then echo "An error occurred while updating the database ${MONGODB}"; exit 1;fi

BIN
laboratory.tar.gz


+ 0 - 6
mongodb-org-3.6.repo

@@ -1,6 +0,0 @@
-[mongodb-org-3.6]
-name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/3.6/x86_64/
-gpgcheck=1
-enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-3.6.asc

File diff suppressed because it is too large
+ 0 - 25
updatedb.sh


Some files were not shown because too many files changed in this diff