diff options
author | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-01-28 22:19:19 +0100 |
---|---|---|
committer | Jonas Zohren <git-pbkyr@jzohren.de> | 2022-01-28 22:33:49 +0100 |
commit | 44f7a85077e5c249ec618004b0386f3d66f01911 (patch) | |
tree | 21866f4e406db279ee1968dd427fb6065ba33240 /docker | |
parent | 296c68c0cdd0f327a3ef1755cee34bb7aa0a31e7 (diff) | |
download | conduit-44f7a85077e5c249ec618004b0386f3d66f01911.zip |
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
Diffstat (limited to 'docker')
-rw-r--r-- | docker/healthcheck.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh index 7ca0460..efc9491 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? |