From 3d49fcaabd45795d1d8eb1330ff815f9e3e08a91 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 11 Jul 2021 13:43:10 +0200 Subject: [PATCH] Activate msmtp just in case there's a config --- 2020.09/apache/Dockerfile | 4 ---- 2020.09/apache/setup_msmtp.sh | 8 ++++++++ 2020.09/fpm-alpine/Dockerfile | 4 ---- 2020.09/fpm-alpine/setup_msmtp.sh | 8 ++++++++ 2020.09/fpm/Dockerfile | 4 ---- 2020.09/fpm/setup_msmtp.sh | 8 ++++++++ 2021.01/apache/Dockerfile | 4 ---- 2021.01/apache/setup_msmtp.sh | 8 ++++++++ 2021.01/fpm-alpine/Dockerfile | 4 ---- 2021.01/fpm-alpine/setup_msmtp.sh | 8 ++++++++ 2021.01/fpm/Dockerfile | 4 ---- 2021.01/fpm/setup_msmtp.sh | 8 ++++++++ 2021.04/apache/Dockerfile | 4 ---- 2021.04/apache/setup_msmtp.sh | 8 ++++++++ 2021.04/fpm-alpine/Dockerfile | 4 ---- 2021.04/fpm-alpine/setup_msmtp.sh | 8 ++++++++ 2021.04/fpm/Dockerfile | 4 ---- 2021.04/fpm/setup_msmtp.sh | 8 ++++++++ 2021.07/apache/Dockerfile | 4 ---- 2021.07/apache/setup_msmtp.sh | 8 ++++++++ 2021.07/fpm-alpine/Dockerfile | 4 ---- 2021.07/fpm-alpine/setup_msmtp.sh | 8 ++++++++ 2021.07/fpm/Dockerfile | 4 ---- 2021.07/fpm/setup_msmtp.sh | 8 ++++++++ 2021.09-dev/apache/Dockerfile | 4 ---- 2021.09-dev/apache/setup_msmtp.sh | 8 ++++++++ 2021.09-dev/fpm-alpine/Dockerfile | 4 ---- 2021.09-dev/fpm-alpine/setup_msmtp.sh | 8 ++++++++ 2021.09-dev/fpm/Dockerfile | 4 ---- 2021.09-dev/fpm/setup_msmtp.sh | 8 ++++++++ Dockerfile-alpine.template | 4 ---- Dockerfile-debian.template | 4 ---- docker-setup_msmtp.sh | 8 ++++++++ 33 files changed, 128 insertions(+), 68 deletions(-) diff --git a/2020.09/apache/Dockerfile b/2020.09/apache/Dockerfile index 343b2a4..15f41a7 100644 --- a/2020.09/apache/Dockerfile +++ b/2020.09/apache/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2020.09/apache/setup_msmtp.sh b/2020.09/apache/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2020.09/apache/setup_msmtp.sh +++ b/2020.09/apache/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2020.09/fpm-alpine/Dockerfile b/2020.09/fpm-alpine/Dockerfile index d8e1fbd..b63e7e7 100644 --- a/2020.09/fpm-alpine/Dockerfile +++ b/2020.09/fpm-alpine/Dockerfile @@ -83,10 +83,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2020.09/fpm-alpine/setup_msmtp.sh b/2020.09/fpm-alpine/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2020.09/fpm-alpine/setup_msmtp.sh +++ b/2020.09/fpm-alpine/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2020.09/fpm/Dockerfile b/2020.09/fpm/Dockerfile index 348f34b..c2db2ee 100644 --- a/2020.09/fpm/Dockerfile +++ b/2020.09/fpm/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2020.09/fpm/setup_msmtp.sh b/2020.09/fpm/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2020.09/fpm/setup_msmtp.sh +++ b/2020.09/fpm/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.01/apache/Dockerfile b/2021.01/apache/Dockerfile index 31346ad..b3ca98a 100644 --- a/2021.01/apache/Dockerfile +++ b/2021.01/apache/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.01/apache/setup_msmtp.sh b/2021.01/apache/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.01/apache/setup_msmtp.sh +++ b/2021.01/apache/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.01/fpm-alpine/Dockerfile b/2021.01/fpm-alpine/Dockerfile index 2dfc46c..c0253aa 100644 --- a/2021.01/fpm-alpine/Dockerfile +++ b/2021.01/fpm-alpine/Dockerfile @@ -83,10 +83,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.01/fpm-alpine/setup_msmtp.sh b/2021.01/fpm-alpine/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.01/fpm-alpine/setup_msmtp.sh +++ b/2021.01/fpm-alpine/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.01/fpm/Dockerfile b/2021.01/fpm/Dockerfile index 62fbf3d..5172454 100644 --- a/2021.01/fpm/Dockerfile +++ b/2021.01/fpm/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.01/fpm/setup_msmtp.sh b/2021.01/fpm/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.01/fpm/setup_msmtp.sh +++ b/2021.01/fpm/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.04/apache/Dockerfile b/2021.04/apache/Dockerfile index 2bb120d..76ccaf0 100644 --- a/2021.04/apache/Dockerfile +++ b/2021.04/apache/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.04/apache/setup_msmtp.sh b/2021.04/apache/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.04/apache/setup_msmtp.sh +++ b/2021.04/apache/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.04/fpm-alpine/Dockerfile b/2021.04/fpm-alpine/Dockerfile index 327729d..a480e97 100644 --- a/2021.04/fpm-alpine/Dockerfile +++ b/2021.04/fpm-alpine/Dockerfile @@ -83,10 +83,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.04/fpm-alpine/setup_msmtp.sh b/2021.04/fpm-alpine/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.04/fpm-alpine/setup_msmtp.sh +++ b/2021.04/fpm-alpine/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.04/fpm/Dockerfile b/2021.04/fpm/Dockerfile index 77cd06c..7096e8e 100644 --- a/2021.04/fpm/Dockerfile +++ b/2021.04/fpm/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.04/fpm/setup_msmtp.sh b/2021.04/fpm/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.04/fpm/setup_msmtp.sh +++ b/2021.04/fpm/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.07/apache/Dockerfile b/2021.07/apache/Dockerfile index d5c927e..17fa573 100644 --- a/2021.07/apache/Dockerfile +++ b/2021.07/apache/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.07/apache/setup_msmtp.sh b/2021.07/apache/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.07/apache/setup_msmtp.sh +++ b/2021.07/apache/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.07/fpm-alpine/Dockerfile b/2021.07/fpm-alpine/Dockerfile index f7d1081..599f7f3 100644 --- a/2021.07/fpm-alpine/Dockerfile +++ b/2021.07/fpm-alpine/Dockerfile @@ -83,10 +83,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.07/fpm-alpine/setup_msmtp.sh b/2021.07/fpm-alpine/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.07/fpm-alpine/setup_msmtp.sh +++ b/2021.07/fpm-alpine/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.07/fpm/Dockerfile b/2021.07/fpm/Dockerfile index 63b2c1b..8f19f28 100644 --- a/2021.07/fpm/Dockerfile +++ b/2021.07/fpm/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.07/fpm/setup_msmtp.sh b/2021.07/fpm/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.07/fpm/setup_msmtp.sh +++ b/2021.07/fpm/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.09-dev/apache/Dockerfile b/2021.09-dev/apache/Dockerfile index e33bc87..1d5afdc 100644 --- a/2021.09-dev/apache/Dockerfile +++ b/2021.09-dev/apache/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.09-dev/apache/setup_msmtp.sh b/2021.09-dev/apache/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.09-dev/apache/setup_msmtp.sh +++ b/2021.09-dev/apache/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.09-dev/fpm-alpine/Dockerfile b/2021.09-dev/fpm-alpine/Dockerfile index f0a02be..c62466e 100644 --- a/2021.09-dev/fpm-alpine/Dockerfile +++ b/2021.09-dev/fpm-alpine/Dockerfile @@ -83,10 +83,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.09-dev/fpm-alpine/setup_msmtp.sh b/2021.09-dev/fpm-alpine/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.09-dev/fpm-alpine/setup_msmtp.sh +++ b/2021.09-dev/fpm-alpine/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/2021.09-dev/fpm/Dockerfile b/2021.09-dev/fpm/Dockerfile index 54b412f..aba8978 100644 --- a/2021.09-dev/fpm/Dockerfile +++ b/2021.09-dev/fpm/Dockerfile @@ -108,10 +108,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/2021.09-dev/fpm/setup_msmtp.sh b/2021.09-dev/fpm/setup_msmtp.sh index b90c42c..b14c097 100644 --- a/2021.09-dev/fpm/setup_msmtp.sh +++ b/2021.09-dev/fpm/setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8132fd3..645a470 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -82,10 +82,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 8e35e6e..1203573 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -107,10 +107,6 @@ RUN set -ex; \ echo 'opcache.revalidte_freq=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \ \ - { \ - echo sendmail_path = "/usr/bin/msmtp -t"; \ - } > /usr/local/etc/php/conf.d/sendmail.ini; \ - \ echo 'apc.enable_cli=1' >> /usr/local/etc/php/conf.d/docker-php-ext-apcu.ini; \ \ echo 'memory_limit=512M' > /usr/local/etc/php/conf.d/memory-limit.ini; \ diff --git a/docker-setup_msmtp.sh b/docker-setup_msmtp.sh index b90c42c..b14c097 100644 --- a/docker-setup_msmtp.sh +++ b/docker-setup_msmtp.sh @@ -34,5 +34,13 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost" echo "aliases /etc/aliases" } >/etc/msmtprc + # enable msmtp setup + { + echo sendmail_path = "/usr/bin/msmtp -t"; + } > /usr/local/etc/php/conf.d/sendmail.ini + + # reload php-config per signal + kill -USR2 1 + echo "Setup finished" fi