Владимир Томишинец 5 жил өмнө
parent
commit
7baae2469b
2 өөрчлөгдсөн 22 нэмэгдсэн , 22 устгасан
  1. 16 16
      docker-entrypoint.sh
  2. 6 6
      healthcheck.sh

+ 16 - 16
docker-entrypoint.sh

@@ -1,22 +1,22 @@
 #!/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
+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
 
-#   echo "Initial nslookup ${ADMIN_HOST}.${APPNET}"
-#   nslookup ${ADMIN_HOST}.${APPNET}
-#   while [ $? -ne 0 ]; do
-#     echo "Waiting for ${ADMIN_HOST}.${APPNET} to become available"
-#     sleep 1
-#     nslookup ${ADMIN_HOST}.${APPNET}
-#   done
-#fi
+   echo "Initial nslookup ${ADMIN_HOST}.${APPNET}"
+   nslookup ${ADMIN_HOST}.${APPNET}
+   while [ $? -ne 0 ]; do
+     echo "Waiting for ${ADMIN_HOST}.${APPNET} to become available"
+     sleep 1
+     nslookup ${ADMIN_HOST}.${APPNET}
+   done
+fi
 
 # See Redmine 103910
 admin_ip=$(nslookup ${ADMIN_HOST}.${APPNET}|grep Address|tail -n +2|cut -d " " -f2)

+ 6 - 6
healthcheck.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-#containerstart=`stat -c %Z /proc/1`
-#curtime=`date +%s`
-#if (( curtime-containerstart < 180 )); then
-#    echo "Container start period, returning 0"
-#    exit 0
-#fi
+containerstart=`stat -c %Z /proc/1`
+curtime=`date +%s`
+if (( curtime-containerstart < 180 )); then
+    echo "Container start period, returning 0"
+    exit 0
+fi
 
 curl -f -H 'Host:demo.infoclinica.ru' 127.0.0.1:9000/login || exit 1