From 838a6e1499000abcee1d43aa85e648b04c4640e7 Mon Sep 17 00:00:00 2001 From: Alexandre BRACH Date: Thu, 9 Jul 2020 17:43:36 +0200 Subject: [PATCH] use PHRASEANET_TRUSTED_PROXY env var --- docker/phraseanet/entrypoint.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/phraseanet/entrypoint.sh b/docker/phraseanet/entrypoint.sh index 820023455e..24fcf17661 100755 --- a/docker/phraseanet/entrypoint.sh +++ b/docker/phraseanet/entrypoint.sh @@ -31,11 +31,14 @@ if [ -f "$FILE" ]; then bin/setup system:config set registry.email.smtp-password $PHRASEANET_SMTP_PASSWORD bin/setup system:config set registry.email.emitter-email $PHRASEANET_EMITTER_EMAIL bin/setup system:config set registry.email.prefix $PHRASEANET_MAIL_OBJECT_PREFIX + if [[ -n $PHRASEANET_TRUSTED_PROXY ]]; then + bin/setup system:config add trusted-proxies $PHRASEANET_TRUSTED_PROXY + fi fi if [[ -n ${PHRASEANET_ADMIN_ACCOUNT_ID} && $PHRASEANET_ADMIN_ACCOUNT_ID =~ ^[0-9]+$ ]]; then bin/console user:password --user_id=$PHRASEANET_ADMIN_ACCOUNT_ID --password $PHRASEANET_ADMIN_ACCOUNT_PASSWORD -y fi - + else echo "$FILE doesn't exist, entering setup..." runuser app -c docker/phraseanet/auto-install.sh @@ -55,7 +58,7 @@ chown -R app:app \ datas \ tmp \ logs \ - www + www if [ -d "plugins/" ];then chown -R app:app plugins;