瀏覽代碼

Change configs. See Redmine 114401

Владимир Томишинец 5 年之前
父節點
當前提交
2e6d69a435
共有 2 個文件被更改,包括 15 次插入15 次删除
  1. 9 9
      docker-entrypoint.sh
  2. 6 6
      healthcheck.sh

+ 9 - 9
docker-entrypoint.sh

@@ -1,14 +1,14 @@
 #!/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
+#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
 sed -i 's/      >> "$CATALINA_OUT" 2>\&1 "\&"/      "\&"/' /opt/tomcat8/bin/catalina.sh
 sed -i 's/touch "$CATALINA_OUT"/#touch "$CATALINA_OUT"/' /opt/tomcat8/bin/catalina.sh
 #sed -i 's/.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler/.handlers = java.util.logging.ConsoleHandler/' /opt/tomcat8/conf/logging.properties

+ 6 - 6
healthcheck.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-containerstart=`stat -c %Z /proc/1`
-curtime=`date +%s`
-if (( curtime-containerstart < 180 )); then
-    echo "0"
-    exit 0
-fi
+#containerstart=`stat -c %Z /proc/1`
+#curtime=`date +%s`
+#if (( curtime-containerstart < 180 )); then
+#    echo "0"
+#    exit 0
+#fi
 
 curl -f 127.0.0.1:8080/login || exit 1