From 4438da39f9c9aa9d83d1dddbf06616ad287f70eb Mon Sep 17 00:00:00 2001 From: Mathijs van Veluw Date: Wed, 31 Jan 2024 22:31:47 +0100 Subject: [PATCH] Fix healthcheck when using .env file (#4299) It seems Debian based images see the `.env` file in the `pwd` path, but sourcing it via `. .env` breaks. It does work if you provide the full path `/.env`. Changed the default to `/.env`. Alpine does not have an issue with both ways. --- docker/healthcheck.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh index 9d518c1a..2d892e80 100755 --- a/docker/healthcheck.sh +++ b/docker/healthcheck.sh @@ -1,17 +1,15 @@ -#!/bin/sh +#!/usr/bin/env sh # Use the value of the corresponding env var (if present), # or a default value otherwise. -: "${DATA_FOLDER:="data"}" +: "${DATA_FOLDER:="/data"}" : "${ROCKET_PORT:="80"}" +: "${ENV_FILE:="/.env"}" CONFIG_FILE="${DATA_FOLDER}"/config.json -# Check if there is a .env file configured +# Check if the $ENV_FILE file exist and is readable # If that is the case, load it into the environment before running any check -if [ -z "${ENV_FILE}" ]; then - ENV_FILE=".env" -fi if [ -r "${ENV_FILE}" ]; then # shellcheck disable=SC1090 . "${ENV_FILE}"