From 61e31132da592158539e7a2be4874214ceae06e7 Mon Sep 17 00:00:00 2001 From: Philipp Date: Thu, 23 Jul 2020 22:51:09 +0200 Subject: [PATCH] [Hotfix] Wrong SMTP env variable --- 2020.07/apache/entrypoint.sh | 2 +- 2020.07/fpm-alpine/entrypoint.sh | 2 +- 2020.07/fpm/entrypoint.sh | 2 +- 2020.09-dev/apache/entrypoint.sh | 2 +- 2020.09-dev/fpm-alpine/entrypoint.sh | 2 +- 2020.09-dev/fpm/entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2020.07/apache/entrypoint.sh b/2020.07/apache/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.07/apache/entrypoint.sh +++ b/2020.07/apache/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/2020.07/fpm-alpine/entrypoint.sh b/2020.07/fpm-alpine/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.07/fpm-alpine/entrypoint.sh +++ b/2020.07/fpm-alpine/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/2020.07/fpm/entrypoint.sh b/2020.07/fpm/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.07/fpm/entrypoint.sh +++ b/2020.07/fpm/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/2020.09-dev/apache/entrypoint.sh b/2020.09-dev/apache/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.09-dev/apache/entrypoint.sh +++ b/2020.09-dev/apache/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/2020.09-dev/fpm-alpine/entrypoint.sh b/2020.09-dev/fpm-alpine/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.09-dev/fpm-alpine/entrypoint.sh +++ b/2020.09-dev/fpm-alpine/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/2020.09-dev/fpm/entrypoint.sh b/2020.09-dev/fpm/entrypoint.sh index adf2d05..cb84a52 100755 --- a/2020.09-dev/fpm/entrypoint.sh +++ b/2020.09-dev/fpm/entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index adf2d05..cb84a52 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -36,7 +36,7 @@ setup_msmtp() { # create msmtp settings { echo "account default" - echo "host $SMTP_DOMAIN" + echo "host $SMTP" if [ -n "${SMTP_PORT+x}" ]; then echo "port $SMTP_PORT"; else echo "port 587"; fi echo "from $smtp_from@$SMTP_DOMAIN" echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames