From 44f7a85077e5c249ec618004b0386f3d66f01911 Mon Sep 17 00:00:00 2001
From: Jonas Zohren <git-pbkyr@jzohren.de>
Date: Fri, 28 Jan 2022 22:19:19 +0100
Subject: [PATCH] fix: Use default port for healthcheck as fallback
Conduit can start without a specific port being configured.
This adjusts the healthcheck script to tolerate that state.
Closes https://gitlab.com/famedly/conduit/-/issues/222
---
docker/healthcheck.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh
index 7ca04602b..efc94917e 100644
--- a/docker/healthcheck.sh
+++ b/docker/healthcheck.sh
@@ -1,10 +1,15 @@
#!/bin/sh
# If the port is not specified as env var, take it from the config file
-if [ -z ${CONDUIT_PORT} ]; then
+if [ -z "${CONDUIT_PORT}" ]; then
CONDUIT_PORT=$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')
fi
+# If the config file also does not contain a default port, just use the default one: 6167.
+if [ -z "${CONDUIT_PORT}" ]; then
+ CONDUIT_PORT=6167
+fi
+
# The actual health check.
# We try to first get a response on HTTP and when that fails on HTTPS and when that fails, we exit with code 1.
# TODO: Change this to a single wget call. Do we have a config value that we can check for that?
--
GitLab