From 929722d6404da1cd6288f8d4b94fe59250a98263 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Thu, 6 May 2021 13:46:41 +0200 Subject: [PATCH] Use manual approach on entrypoint for now See https://git.autonomic.zone/coop-cloud/peertube/issues/2. --- entrypoint.sh.tmpl | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 3f14afb..ee1c8ef 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -2,31 +2,13 @@ set -e -file_env() { - local var="$1" - local fileVar="${var}_FILE" - local def="${2:-}" +# Note(decentral1se): get file_env function back soon +# https://git.autonomic.zone/coop-cloud/peertube/issues/2 - if [ "${!var:-}" ] && [ "${!fileVar:-}" ]; then - echo >&2 "error: both $var and $fileVar are set (but are exclusive)" - exit 1 - fi +export PEERTUBE_DB_PASSWORD=$(cat "$PEERTUBE_DB_PASSWORD_FILE") - local val="$def" - - if [ "${!var:-}" ]; then - val="${!var}" - elif [ "${!fileVar:-}" ]; then - val="$(< "${!fileVar}")" - fi - - export "$var"="$val" - unset "$fileVar" -} - -file_env "PEERTUBE_DB_PASSWORD" {{ if (env "PEERTUBE_SMTP_ENABLED") }} -file_env "PEERTUBE_SMTP_PASSWORD" +export PEERTUBE_SMTP_PASSWORD=$(cat "$PEERTUBE_SMTP_PASSWORD_FILE") {{ end }} # upstream entrypoint