Work on initial release

Dockerfile

@@ -4,7 +4,7 @@ COPY docker-entrypoint.sh \
      updatedb.sh \
      healthcheck.sh \
      /opt/
-# COPY mongodb-org-3.6.repo /etc/yum.repos.d/
+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" \
@@ -12,11 +12,9 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     JAVA_OPTS="-Xms512M -Xmx1024M -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true" \
     WORKDIR=$CATALINA_HOME \
     DB_CLUSTER=mongodb \
-    MONGOHOST=mongodb \
     MONGODB=laboratory \
-    HOST=fb3_demo \
-    PORT=3050 \
-    ALIAS=dev_iru_swarm_lab_99001 \
+    FB_HOST=fb3_demo \
+    FB_DATABASE=lab_99001 \
     REPORT_SERVER_URL=http://reportproxy4.infoclinica.lan \
     APPNET=labnetwork
 EXPOSE 8091 8080 8009 2551
@@ -30,6 +28,7 @@ RUN set -x \
            && yum install telnet -y \
            && yum install web-laboratory-admin -y \
            && yum install nc -y \
+           && yum install mongodb-org-shell -y \
            && yum clean all \
            && chmod +x /opt/docker-entrypoint.sh \
            && chmod +x /opt/healthcheck.sh \
@@ -37,7 +36,6 @@ RUN set -x \
            && cd /opt/tomcat/conf/web-laboratory-admin/localhost \
            && ln -s /etc/web-laboratory-admin/ROOT.xml ROOT.xml
 
-#           && yum install mongodb-org-shell -y \
 
 USER tomcat
 CMD ["catalina.sh", "run"]

docker-entrypoint.sh

@@ -1,27 +1,17 @@
 #!/usr/bin/env bash
 
-if [ ! -z "${APPNET}" ]; then
-   echo "Initial nslookup ${HOSTNAME}.${APPNET}"
-   nslookup ${HOSTNAME}.${APPNET}
-   while [ $? -ne 0 ]; do
-     echo "Waiting for ${HOSTNAME}.${APPNET} to become available"
-     sleep 1
-     nslookup ${HOSTNAME}.${APPNET}
-   done
-fi
+echo "Initial nslookup ${HOSTNAME}.${APPNET}"
+nslookup ${HOSTNAME}.${APPNET}
+while [ $? -ne 0 ]; do
+  echo "Waiting for ${HOSTNAME}.${APPNET} to become available"
+  sleep 1
+  nslookup ${HOSTNAME}.${APPNET}
+done
 
+/opt/updatedb.sh
 
-if [ "$DB_CLUSTER" ]; then
-   sed -i "s/192.168.201.12:27017/${DB_CLUSTER}/" /etc/web-laboratory-admin/application.conf
-fi
+sed -i "s/192.168.201.12:27017/${DB_CLUSTER}/" /etc/web-laboratory-admin/application.conf
 
 sed -i "s/192\.168\.201\.13/$(nslookup ${HOSTNAME}.${APPNET} | grep Address | tail -n1 | cut -f2 -d' ')/" /etc/web-laboratory-admin/application.conf
 
-#if [ -n  ${CREATE_DATASOURCE} ] && [ ${CREATE_DATASOURCE} == "yes" ]
-#then
-#  while [ $(nc -w 2 mongodb 27017; echo $?) -ne 0 ]; do echo "Go to sleep"; sleep 2;done
-#  /opt/updatedb.sh
-#fi
-
-
 exec "$@"

healthcheck.sh

@@ -3,6 +3,7 @@
 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
     echo "0"
     exit 0
 fi