Revert "Use manual approach on entrypoint for now"

This reverts commit 929722d640.
This commit is contained in:
decentral1se 2021-05-06 15:24:53 +02:00
parent c828be2c68
commit 86d5b8d1c4
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A
1 changed files with 22 additions and 8 deletions

View File

@ -2,16 +2,30 @@
set -e set -e
# Note(decentral1se): get file_env function back soon file_env() {
# https://git.autonomic.zone/coop-cloud/peertube/issues/2 local var="$1"
local fileVar="${var}_FILE"
local def="${2:-}"
export PEERTUBE_DB_PASSWORD=$(cat "$PEERTUBE_DB_PASSWORD_FILE") if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then
unset PEERTUBE_DB_PASSWORD_FILE echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
exit 1
fi
if [ -z "$PEERTUBE_SMTP_ENABLED" ]; then local val="$def"
export PEERTUBE_SMTP_PASSWORD=$(cat "$PEERTUBE_SMTP_PASSWORD_FILE")
unset PEERTUBE_SMTP_PASSWORD_FILE if [ "${!var:-}" ]; then
fi val="${!var}"
elif [ "${!fileVar:-}" ]; then
val="$(< "${!fileVar}")"
fi
export "$var"="$val"
unset "$fileVar"
}
file_env "PEERTUBE_DB_PASSWORD"
file_env "PEERTUBE_SMTP_PASSWORD"
# upstream entrypoint # upstream entrypoint
# https://github.com/Chocobozzz/PeerTube/blob/66f77f63437c6774acbd72584a9839a7636ea167/support/docker/production/entrypoint.sh # https://github.com/Chocobozzz/PeerTube/blob/66f77f63437c6774acbd72584a9839a7636ea167/support/docker/production/entrypoint.sh