Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-22 05:10:29 +01:00
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.
Dieser Commit ist enthalten in:
Ursprung
0b2383ab56
Commit
4438da39f9
1 geänderte Dateien mit 4 neuen und 6 gelöschten Zeilen
|
@ -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}"
|
||||||
|
|
Laden …
In neuem Issue referenzieren