From b8188b792d99d4d73cb4ab312dbb7f2d43b99701 Mon Sep 17 00:00:00 2001 From: 12ww1160 Date: Tue, 2 Dec 2025 17:38:12 +0100 Subject: [PATCH] OP#176 fix envsubst --- start.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/start.sh b/start.sh index c3cea0c..c27a0ba 100755 --- a/start.sh +++ b/start.sh @@ -1,17 +1,19 @@ #!/bin/bash + set -e -# Construct DATABASE_URL from individual vars if not set directly -if [[ -z "${DATABASE_URL}" ]]; then - if [[ -z "${PG_USER}" || -z "${PG_PASSWORD}" || -z "${PG_HOST}" || -z "${PG_DBNAME}" ]]; then - echo "ERROR: DATABASE_URL not set and one of PG_USER/PG_PASSWORD/PG_HOST/PG_DBNAME missing" - exit 1 - fi - export DATABASE_URL="postgresql://${PG_USER}:${PG_PASSWORD}@${PG_HOST}:${PG_PORT:-5432}/${PG_DBNAME}?sslmode=${PG_SSLMODE:-disable}" - echo "Constructed DATABASE_URL: ${DATABASE_URL}" +if [[ "${DATABASE_URL}" == "" ]]; then + echo 'Missing DATABASE_URL' + echo 'example -e DATABASE_URL="user= password= host= port= database="' + exit 1 fi -# Strip single quotes from defaults (Alpine bash keeps them) +trap shutdown INT + +function shutdown() { + pkill -SIGINT postgresql-prometheus-adapter +} + adapter_send_timeout=$(echo "${adapter_send_timeout:-'30s'}" | tr -d "'") web_listen_address=$(echo "${web_listen_address:-':9201'}" | tr -d "'") web_telemetry_path=$(echo "${web_telemetry_path:-'/metrics'}" | tr -d "'")