mirror
/
friendica-docker
kopia lustrzana https://github.com/friendica/docker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Revert "Activate msmtp just in case there's a config" 

This reverts commit 3d49fcaabd.
pull/160/head
Philipp 2021-08-28 20:54:48 +02:00
rodzic b8c192e711
commit 7661882be8
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 9A28B7D4FF5667BD
33 zmienionych plików z 68 dodań i 128 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
2020.09/apache/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2020.09/apache/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2020.09/fpm-alpine/Dockerfile
Wyświetl plik

@ -83,6 +83,10 @@ 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; \

8
2020.09/fpm-alpine/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2020.09/fpm/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2020.09/fpm/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.01/apache/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.01/apache/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.01/fpm-alpine/Dockerfile
Wyświetl plik

@ -83,6 +83,10 @@ 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; \

8
2021.01/fpm-alpine/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.01/fpm/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.01/fpm/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.04/apache/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.04/apache/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.04/fpm-alpine/Dockerfile
Wyświetl plik

@ -83,6 +83,10 @@ 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; \

8
2021.04/fpm-alpine/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.04/fpm/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.04/fpm/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.07/apache/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.07/apache/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.07/fpm-alpine/Dockerfile
Wyświetl plik

@ -83,6 +83,10 @@ 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; \

8
2021.07/fpm-alpine/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.07/fpm/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.07/fpm/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.09-dev/apache/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.09-dev/apache/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.09-dev/fpm-alpine/Dockerfile
Wyświetl plik

@ -83,6 +83,10 @@ 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; \

8
2021.09-dev/fpm-alpine/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
2021.09-dev/fpm/Dockerfile
Wyświetl plik

@ -108,6 +108,10 @@ 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; \

8
2021.09-dev/fpm/setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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

4
Dockerfile-alpine.template
Wyświetl plik

@ -82,6 +82,10 @@ 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; \

4
Dockerfile-debian.template
Wyświetl plik

@ -107,6 +107,10 @@ 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; \

8
docker-setup_msmtp.sh
Wyświetl plik

@ -34,13 +34,5 @@ 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