MyFavMirrors
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Mathijs van Veluw 2024-01-31 22:31:47 +01:00 committed by GitHub
parent 0b2383ab56
commit 4438da39f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/healthcheck.sh
View File

@ -1,17 +1,15 @@
#!/bin/sh #!/usr/bin/env sh
# Use the value of the corresponding env var (if present), # Use the value of the corresponding env var (if present),
# or a default value otherwise. # or a default value otherwise.
: "${DATA_FOLDER:="data"}" : "${DATA_FOLDER:="/data"}"
: "${ROCKET_PORT:="80"}" : "${ROCKET_PORT:="80"}"
: "${ENV_FILE:="/.env"}"
CONFIG_FILE="${DATA_FOLDER}"/config.json 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 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 if [ -r "${ENV_FILE}" ]; then
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${ENV_FILE}" . "${ENV_FILE}"