debug

docker-entrypoint.sh

@@ -1,26 +1,12 @@
 #!/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
-
-   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)
-echo ${admin_ip} > /tmp/admin_ip
+echo "Initial nslookup ${ADMIN_HOST}
+    nslookup ${ADMIN_HOST}
+    while [ $? -ne 0 ]; do
+        echo "Waiting for ${ADMIN_HOST} to become available"
+        sleep 1
+        nslookup ${ADMIN_HOST}.${APPNET}
+    done
 
 echo "#Dummy" >> /etc/rc.d/init.d/functions
 source /etc/init.d/web-registry-portal status

healthcheck.sh

@@ -1,31 +1,3 @@
 #!/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
-
 curl -f -H 'Host:demo.infoclinica.ru' 127.0.0.1:9000/login || exit 1
-
-# Проверяем наличие файла с переменной time_to_dead
-if [ -f /tmp/dead ];then
-  if (( ${curtime} > $(cat /tmp/dead) ));then kill 1;fi
-else
-# Определяем изменился ли адрес админки
-  ping -c3 $(cat /tmp/admin_ip)
-  if [[ $? -ne 0 ]]; then
-    new_admin_ip=$(dig +short ${ADMIN_HOST}.${APPNET})
-    if [[ ${new_admin_ip} != $(cat /tmp/admin_ip) ]];then
-      ping -c3 ${new_admin_ip} || exit 0
-    fi
-# Вычисляем адреса task'ов и сортируем их
-    sorted=($(echo $(dig tasks.${SERVICE_NAME}.${APPNET} +short)|tr " " "\n"|sort -n))
-    for (( i=0; i < ${#sorted[*]}; i++ ))
-    do
-      [[ $(ip a | grep ${sorted[${i}]}) ]] && echo $((${i}*180+$(date +%s)+40)) > /tmp/dead
-    done
-  fi
-fi
-exit 0