From 2bf208d7decfe48ae7d256f02453276d2bdd0d70 Mon Sep 17 00:00:00 2001 From: Damien Retzinger Date: Mon, 26 Oct 2020 17:24:25 -0400 Subject: [PATCH] feat(mailhog): make mailhog work out-of-the-box --- compose/mailhog/1.0.yaml | 5 +++-- php/7.2/alpine-develop/conf/php.ini | 4 +++- php/7.3/alpine-develop/conf/php.ini | 4 +++- php/7.4/alpine-develop/conf/php.ini | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compose/mailhog/1.0.yaml b/compose/mailhog/1.0.yaml index 723f8e2..5f700e5 100644 --- a/compose/mailhog/1.0.yaml +++ b/compose/mailhog/1.0.yaml @@ -3,9 +3,10 @@ version : '3' services: magento2: environment: - - CONFIG__DEFAULT__GENERAL__STORE__EMAIL__HOST=mailhog - - CONFIG__DEFAULT__GENERAL__STORE__EMAIL__PORT=1025 + - PHP_SENDMAIL_PATH=/usr/sbin/sendmail -S mailhog:1025 mailhog: image: mailhog/mailhog:v1.0.1 ports: - 8025:8025 + networks: + - backend diff --git a/php/7.2/alpine-develop/conf/php.ini b/php/7.2/alpine-develop/conf/php.ini index 04123d2..e85dc2c 100644 --- a/php/7.2/alpine-develop/conf/php.ini +++ b/php/7.2/alpine-develop/conf/php.ini @@ -9,4 +9,6 @@ post_max_size = 20M display_errors = stderr error_log = /dev/stderr display_startup_errors = On -log_errors = On \ No newline at end of file +log_errors = On + +sendmail_path = ${PHP_SENDMAIL_PATH} diff --git a/php/7.3/alpine-develop/conf/php.ini b/php/7.3/alpine-develop/conf/php.ini index 04123d2..e85dc2c 100644 --- a/php/7.3/alpine-develop/conf/php.ini +++ b/php/7.3/alpine-develop/conf/php.ini @@ -9,4 +9,6 @@ post_max_size = 20M display_errors = stderr error_log = /dev/stderr display_startup_errors = On -log_errors = On \ No newline at end of file +log_errors = On + +sendmail_path = ${PHP_SENDMAIL_PATH} diff --git a/php/7.4/alpine-develop/conf/php.ini b/php/7.4/alpine-develop/conf/php.ini index 04123d2..e85dc2c 100644 --- a/php/7.4/alpine-develop/conf/php.ini +++ b/php/7.4/alpine-develop/conf/php.ini @@ -9,4 +9,6 @@ post_max_size = 20M display_errors = stderr error_log = /dev/stderr display_startup_errors = On -log_errors = On \ No newline at end of file +log_errors = On + +sendmail_path = ${PHP_SENDMAIL_PATH}