From c859367e1058c0b740d552ab1d4c7a5fd1a52310 Mon Sep 17 00:00:00 2001 From: Christian Winther Date: Fri, 26 Jan 2024 20:14:40 +0000 Subject: [PATCH] fix 02-check-config.sh logic and bad .env.docker syntax --- .env.docker | 4 ++-- docker/shared/root/docker/entrypoint.d/02-check-config.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.env.docker b/.env.docker index c3e0a55ae..7be6e3e05 100644 --- a/.env.docker +++ b/.env.docker @@ -1102,10 +1102,10 @@ DOCKER_WORKER_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL}" ################################################################################ # Set this to a non-empty value (e.g. "disabled") to disable the [proxy] and [proxy-acme] service -#DOCKER_PROXY_PROFILE="" +DOCKER_PROXY_PROFILE="" # Set this to a non-empty value (e.g. "disabled") to disable the [proxy-acme] service -DOCKER_PROXY_ACME_PROFILE="${DOCKER_PROXY_PROFILE:-}" +DOCKER_PROXY_ACME_PROFILE="${DOCKER_PROXY_PROFILE}" # How often Docker health check should run for [proxy] service DOCKER_PROXY_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL}" diff --git a/docker/shared/root/docker/entrypoint.d/02-check-config.sh b/docker/shared/root/docker/entrypoint.d/02-check-config.sh index eecb150b4..601cf153e 100755 --- a/docker/shared/root/docker/entrypoint.d/02-check-config.sh +++ b/docker/shared/root/docker/entrypoint.d/02-check-config.sh @@ -8,11 +8,10 @@ entrypoint-set-script-name "$0" # Validating dot-env files for any issues for file in "${dot_env_files[@]}"; do - if file-exists "$file"; then + if ! file-exists "${file}"; then log-warning "Could not source file [${file}]: does not exists" continue fi - log-info "Linting dotenv file ${file}" - dotenv-linter --skip=QuoteCharacter --skip=UnorderedKey "${file}" + run-as-current-user dotenv-linter --skip=QuoteCharacter --skip=UnorderedKey "${file}" done