change healthcheck periods, change docker-entrypoint.sh

Dockerfile

@@ -14,7 +14,7 @@ ENV PATH=$CATALINA_HOME/bin:$PATH \
     APPNET=labnetwork \
     ADMIN_HOST=admin-lab
 EXPOSE 8090 9000 2551
-HEALTHCHECK --start-period=30s --interval=15s --timeout=5s --retries=2 CMD /tmp/healthcheck.sh
+HEALTHCHECK --start-period=30s --interval=20s --timeout=10s --retries=2 CMD /tmp/healthcheck.sh
 ARG repo=prod
 ARG version=16.1
 ARG memcached_version=2.3.2

docker-entrypoint.sh

@@ -17,7 +17,7 @@ while [ $? -ne 0 ]; do
 done
 
 # See Redmine 108967
-admin_ip=$(dig ${ADMIN_HOST}.${APPNET} +short)
+admin_ip=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
 echo ${admin_ip} > /tmp/admin_ip
 
 # Для добавления логирования manager memcached. Redmine 107228