Merge pull request #258 from magento/1.1-fwd

Forward-port 1.1 into develop

Author: shiftedreality

images/php/7.2-cli/Dockerfile

@@ -9,6 +9,7 @@ ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 ENV UPDATE_UID_GID false
 ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -28,8 +29,6 @@ RUN apt-get update \
   python3 \
   python3-pip \
   redis-tools \
-  sendmail \
-  sendmail-bin \
   sudo \
   unzip \
   vim \
@@ -67,6 +66,11 @@ RUN pip3 install --upgrade setuptools \
 # Install Grunt
 RUN npm install -g grunt-cli
 
+# Install MailHog
+RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+    && sudo chmod +x mhsendmail_linux_amd64 \
+    && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
+
 # Configure the gd library
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/

images/php/7.2-cli/docker-entrypoint.sh

@@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR}/zz-mail.ini
-    /etc/init.d/sendmail start
+    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\"/" ${PHP_EXT_DIR}/zz-mail.ini
 else
     sed -i "s/!SENDMAIL_PATH!/\"true > \/dev\/null\"/" ${PHP_EXT_DIR}/zz-mail.ini
 fi

images/php/7.2-fpm/Dockerfile

@@ -8,6 +8,7 @@ ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
+ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -16,8 +17,6 @@ RUN apt-get update \
   && apt-get upgrade -y \
   && apt-get install -y --no-install-recommends \
   apt-utils \
-  sendmail-bin \
-  sendmail \
   sudo \
   libbz2-dev \
   libjpeg62-turbo-dev \
@@ -45,6 +44,11 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
+# Install MailHog
+RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+    && sudo chmod +x mhsendmail_linux_amd64 \
+    && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
+
 # Configure the gd library
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/

images/php/7.2-fpm/docker-entrypoint.sh

@@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR}/zz-mail.ini
-    /etc/init.d/sendmail start
+    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\"/" ${PHP_EXT_DIR}/zz-mail.ini
 else
     sed -i "s/!SENDMAIL_PATH!/\"true > \/dev\/null\"/" ${PHP_EXT_DIR}/zz-mail.ini
 fi

images/php/7.3-cli/Dockerfile

@@ -9,6 +9,7 @@ ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 ENV UPDATE_UID_GID false
 ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -28,8 +29,6 @@ RUN apt-get update \
   python3 \
   python3-pip \
   redis-tools \
-  sendmail \
-  sendmail-bin \
   sudo \
   unzip \
   vim \
@@ -65,6 +64,11 @@ RUN pip3 install --upgrade setuptools \
 # Install Grunt
 RUN npm install -g grunt-cli
 
+# Install MailHog
+RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+    && sudo chmod +x mhsendmail_linux_amd64 \
+    && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
+
 # Configure the gd library
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/

images/php/7.3-cli/docker-entrypoint.sh

@@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR}/zz-mail.ini
-    /etc/init.d/sendmail start
+    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\"/" ${PHP_EXT_DIR}/zz-mail.ini
 else
     sed -i "s/!SENDMAIL_PATH!/\"true > \/dev\/null\"/" ${PHP_EXT_DIR}/zz-mail.ini
 fi

images/php/7.3-fpm/Dockerfile

@@ -8,6 +8,7 @@ ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 ENV UPLOAD_MAX_FILESIZE 64M
 ENV UPDATE_UID_GID false
+ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -16,8 +17,6 @@ RUN apt-get update \
   && apt-get upgrade -y \
   && apt-get install -y --no-install-recommends \
   apt-utils \
-  sendmail-bin \
-  sendmail \
   sudo \
   libbz2-dev \
   libjpeg62-turbo-dev \
@@ -43,6 +42,11 @@ RUN apt-get update \
   zip \
   && rm -rf /var/lib/apt/lists/*
 
+# Install MailHog
+RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+    && sudo chmod +x mhsendmail_linux_amd64 \
+    && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
+
 # Configure the gd library
 RUN docker-php-ext-configure \
   gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/

images/php/7.3-fpm/docker-entrypoint.sh

@@ -34,8 +34,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR}/zz-mail.ini
-    /etc/init.d/sendmail start
+    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\"/" ${PHP_EXT_DIR}/zz-mail.ini
 else
     sed -i "s/!SENDMAIL_PATH!/\"true > \/dev\/null\"/" ${PHP_EXT_DIR}/zz-mail.ini
 fi

images/php/7.4-cli/Dockerfile

@@ -9,6 +9,7 @@ ENV DEBUG false
 ENV MAGENTO_RUN_MODE production
 ENV UPDATE_UID_GID false
 ENV COMPOSER_ALLOW_SUPERUSER 1
+ENV ENABLE_SENDMAIL true
 
 ENV PHP_EXTENSIONS bcmath bz2 calendar exif gd gettext intl mysqli opcache pdo_mysql redis soap sockets sysvmsg sysvsem sysvshm xsl zip pcntl
 
@@ -28,8 +29,6 @@ RUN apt-get update \
   python3 \
   python3-pip \
   redis-tools \
-  sendmail \
-  sendmail-bin \
   sudo \
   unzip \
   vim \
@@ -61,6 +60,11 @@ RUN pip3 install --upgrade setuptools \
 # Install Grunt
 RUN npm install -g grunt-cli
 
+# Install MailHog
+RUN wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+    && sudo chmod +x mhsendmail_linux_amd64 \
+    && sudo mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail
+
 # Configure the gd library
 RUN docker-php-ext-configure \
   gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/

images/php/7.4-cli/docker-entrypoint.sh

@@ -42,8 +42,7 @@ PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\/usr\/sbin\/sendmail -t -i/" ${PHP_EXT_DIR}/zz-mail.ini
-    /etc/init.d/sendmail start
+    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:1025\"/" ${PHP_EXT_DIR}/zz-mail.ini
 else
     sed -i "s/!SENDMAIL_PATH!/\"true > \/dev\/null\"/" ${PHP_EXT_DIR}/zz-mail.ini
 fi