Replaced mhsendmail with msmtp and updated PHP settings. Closes #103

docksal · Jan 15, 2019 · 115c9bc · 115c9bc
1 parent ee34bec
commit 115c9bc
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 65 deletions.
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -1,13 +1,3 @@
-# Build mhsendmail
-FROM golang:1.8.3 as mhbuild
-ENV MHSENDMAIL_VERSION=0.2.0
-RUN set -xe; \
-  go get -d github.com/mailhog/mhsendmail; \
-  cd /go/src/github.com/mailhog/mhsendmail; \
-  git checkout tags/v${MHSENDMAIL_VERSION}; \
-  go get github.com/mailhog/mhsendmail
-
-# Build the image
 FROM php:5.6-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -68,6 +58,7 @@ RUN set -xe; \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
 		mc \
+		msmtp \
 		mysql-client \
 		nano \
 		openssh-client \
@@ -367,8 +358,6 @@ RUN set -xe; \
 USER root
 SHELL ["/bin/sh", "-c"]
 
-# Copy mhsendmail binary from stage 1
-COPY --from=mhbuild /go/bin/mhsendmail /usr/local/bin/mhsendmail
 # Copy configs and scripts
 COPY --chown=docker:docker config/.drush /home/docker/.drush
 COPY --chown=docker:docker config/.terminus /home/docker/.terminus

diff --git a/5.6/config/php/zz-php.ini b/5.6/config/php/zz-php.ini
@@ -8,8 +8,10 @@ sendmail_path = /bin/true
 date.timezone = UTC
 display_errors = On
 display_startup_errors = On
+
+[mail]
 ; Enable Mailhog integration by default
-sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
+sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025'
 
 ; Extention settings
 [opcache]

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -1,13 +1,3 @@
-# Build mhsendmail
-FROM golang:1.8.3 as mhbuild
-ENV MHSENDMAIL_VERSION=0.2.0
-RUN set -xe; \
-  go get -d github.com/mailhog/mhsendmail; \
-  cd /go/src/github.com/mailhog/mhsendmail; \
-  git checkout tags/v${MHSENDMAIL_VERSION}; \
-  go get github.com/mailhog/mhsendmail
-
-# Build the image
 FROM php:7.0-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -71,6 +61,7 @@ RUN set -xe; \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
 		mc \
+		msmtp \
 		mysql-client \
 		nano \
 		openssh-client \
@@ -374,8 +365,6 @@ RUN set -xe; \
 USER root
 SHELL ["/bin/sh", "-c"]
 
-# Copy mhsendmail binary from stage 1
-COPY --from=mhbuild /go/bin/mhsendmail /usr/local/bin/mhsendmail
 # Copy configs and scripts
 COPY --chown=docker:docker config/.drush /home/docker/.drush
 COPY --chown=docker:docker config/.terminus /home/docker/.terminus

diff --git a/7.0/config/php/zz-php.ini b/7.0/config/php/zz-php.ini
@@ -7,8 +7,10 @@ sendmail_path = /bin/true
 date.timezone = UTC
 display_errors = On
 display_startup_errors = On
+
+[mail]
 ; Enable Mailhog integration by default
-sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
+sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025'
 
 ; Extention settings
 [opcache]

diff --git a/7.1/Dockerfile b/7.1/Dockerfile
@@ -1,13 +1,3 @@
-# Build mhsendmail
-FROM golang:1.8.3 as mhbuild
-ENV MHSENDMAIL_VERSION=0.2.0
-RUN set -xe; \
-  go get -d github.com/mailhog/mhsendmail; \
-  cd /go/src/github.com/mailhog/mhsendmail; \
-  git checkout tags/v${MHSENDMAIL_VERSION}; \
-  go get github.com/mailhog/mhsendmail
-
-# Build the image
 FROM php:7.1-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -71,6 +61,7 @@ RUN set -xe; \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
 		mc \
+		msmtp \
 		mysql-client \
 		nano \
 		openssh-client \
@@ -374,8 +365,6 @@ RUN set -xe; \
 USER root
 SHELL ["/bin/sh", "-c"]
 
-# Copy mhsendmail binary from stage 1
-COPY --from=mhbuild /go/bin/mhsendmail /usr/local/bin/mhsendmail
 # Copy configs and scripts
 COPY --chown=docker:docker config/.drush /home/docker/.drush
 COPY --chown=docker:docker config/.terminus /home/docker/.terminus

diff --git a/7.1/config/php/zz-php.ini b/7.1/config/php/zz-php.ini
@@ -7,8 +7,10 @@ sendmail_path = /bin/true
 date.timezone = UTC
 display_errors = On
 display_startup_errors = On
+
+[mail]
 ; Enable Mailhog integration by default
-sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
+sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025'
 
 ; Extention settings
 [opcache]

diff --git a/7.2/Dockerfile b/7.2/Dockerfile
@@ -1,13 +1,3 @@
-# Build mhsendmail
-FROM golang:1.8.3 as mhbuild
-ENV MHSENDMAIL_VERSION=0.2.0
-RUN set -xe; \
-  go get -d github.com/mailhog/mhsendmail; \
-  cd /go/src/github.com/mailhog/mhsendmail; \
-  git checkout tags/v${MHSENDMAIL_VERSION}; \
-  go get github.com/mailhog/mhsendmail
-
-# Build the image
 FROM php:7.2-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -71,6 +61,7 @@ RUN set -xe; \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
 		mc \
+		msmtp \
 		mysql-client \
 		nano \
 		openssh-client \
@@ -376,8 +367,6 @@ RUN set -xe; \
 USER root
 SHELL ["/bin/sh", "-c"]
 
-# Copy mhsendmail binary from stage 1
-COPY --from=mhbuild /go/bin/mhsendmail /usr/local/bin/mhsendmail
 # Copy configs and scripts
 COPY --chown=docker:docker config/.drush /home/docker/.drush
 COPY --chown=docker:docker config/.terminus /home/docker/.terminus

diff --git a/7.2/config/php/zz-php.ini b/7.2/config/php/zz-php.ini
@@ -7,8 +7,10 @@ sendmail_path = /bin/true
 date.timezone = UTC
 display_errors = On
 display_startup_errors = On
+
+[mail]
 ; Enable Mailhog integration by default
-sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
+sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025'
 
 ; Extention settings
 [opcache]

diff --git a/7.3/Dockerfile b/7.3/Dockerfile
@@ -1,13 +1,3 @@
-# Build mhsendmail
-FROM golang:1.8.3 as mhbuild
-ENV MHSENDMAIL_VERSION=0.2.0
-RUN set -xe; \
-  go get -d github.com/mailhog/mhsendmail; \
-  cd /go/src/github.com/mailhog/mhsendmail; \
-  git checkout tags/v${MHSENDMAIL_VERSION}; \
-  go get github.com/mailhog/mhsendmail
-
-# Build the image
 FROM php:7.3-fpm
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -71,6 +61,7 @@ RUN set -xe; \
 		# cgi-fcgi binary - used for self-testing (php-fpm)
 		libfcgi-bin \
 		mc \
+		msmtp \
 		mysql-client \
 		nano \
 		openssh-client \
@@ -378,8 +369,6 @@ RUN set -xe; \
 USER root
 SHELL ["/bin/sh", "-c"]
 
-# Copy mhsendmail binary from stage 1
-COPY --from=mhbuild /go/bin/mhsendmail /usr/local/bin/mhsendmail
 # Copy configs and scripts
 COPY --chown=docker:docker config/.drush /home/docker/.drush
 COPY --chown=docker:docker config/.terminus /home/docker/.terminus

diff --git a/7.3/config/php/zz-php.ini b/7.3/config/php/zz-php.ini
@@ -7,8 +7,10 @@ sendmail_path = /bin/true
 date.timezone = UTC
 display_errors = On
 display_startup_errors = On
+
+[mail]
 ; Enable Mailhog integration by default
-sendmail_path = '/usr/local/bin/mhsendmail --smtp-addr=mail:1025'
+sendmail_path = '/usr/bin/msmtp -t --host=mail --port=1025'
 
 ; Extention settings
 [opcache]