From e50e5a1703f80ba860edb3d449f98c0b664a3434 Mon Sep 17 00:00:00 2001 From: 5shreya <140782598+5shreya@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:49:22 +0530 Subject: [PATCH] Update docker-healthcheck --- docker/docker-healthcheck | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/docker/docker-healthcheck b/docker/docker-healthcheck index 39b60c4..9728d11 100755 --- a/docker/docker-healthcheck +++ b/docker/docker-healthcheck @@ -1,11 +1,17 @@ #!/bin/sh set -eu -host="$(hostname -i || echo '127.0.0.1')" -if [ -d "$DOCKER_TLS_CERTDIR" ]; then +host="$(hostname -i 2>/dev/null || { echo 'Failed to get host IP'; exit 1; })" + +if [ -n "${DOCKER_TLS_CERTDIR:-}" ] && [ -d "$DOCKER_TLS_CERTDIR" ]; then export DOCKER_HOST="tcp://$host:2376" -else +elif [ -z "${DOCKER_TLS_CERTDIR:-}" ]; then export DOCKER_HOST="tcp://$host:2375" +else + echo "TLS cert directory does not exist: $DOCKER_TLS_CERTDIR" + exit 1 fi -docker-entrypoint.sh version > /dev/null || exit 1 +docker-entrypoint.sh version > /dev/null || { echo "Failed to get Docker version"; exit 1; } + +