MCLOUD-5624: Unable to enable sending email in the docker (#255)

shiftedreality · web-flow · commit d0a40536ce79 · 2020-07-29T08:13:09.000-05:00
diff --git a/images/php/7.1-cli/Dockerfile b/images/php/7.1-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 mcrypt 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 \
@@ -66,6 +65,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/
diff --git a/images/php/7.1-cli/docker-entrypoint.sh b/images/php/7.1-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
diff --git a/images/php/7.1-fpm/Dockerfile b/images/php/7.1-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 mcrypt 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/
diff --git a/images/php/7.1-fpm/docker-entrypoint.sh b/images/php/7.1-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
diff --git a/images/php/7.2-cli/Dockerfile b/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 \
@@ -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/
diff --git a/images/php/7.2-cli/docker-entrypoint.sh b/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
diff --git a/images/php/7.2-fpm/Dockerfile b/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 \
@@ -44,6 +43,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/
diff --git a/images/php/7.2-fpm/docker-entrypoint.sh b/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
diff --git a/images/php/7.3-cli/Dockerfile b/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 \
@@ -63,6 +62,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/
diff --git a/images/php/7.3-cli/docker-entrypoint.sh b/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
diff --git a/images/php/7.3-fpm/Dockerfile b/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 \
@@ -42,6 +41,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/
diff --git a/images/php/7.3-fpm/docker-entrypoint.sh b/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
diff --git a/images/php/7.4-cli/Dockerfile b/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 \
@@ -59,6 +58,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/
diff --git a/images/php/7.4-cli/docker-entrypoint.sh b/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
diff --git a/images/php/7.4-fpm/Dockerfile b/images/php/7.4-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 \
@@ -38,6 +37,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=/usr/include/ --with-jpeg=/usr/include/
diff --git a/images/php/7.4-fpm/docker-entrypoint.sh b/images/php/7.4-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
diff --git a/images/php/cli/Dockerfile b/images/php/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%}
 
@@ -29,6 +30,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
 {%docker-php-ext-configure%}
 
diff --git a/images/php/cli/docker-entrypoint.sh b/images/php/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
diff --git a/images/php/fpm/Dockerfile b/images/php/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%}
 
@@ -18,6 +19,11 @@ RUN apt-get update \
   {%packages%} \
   && 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
 {%docker-php-ext-configure%}
 
diff --git a/images/php/fpm/docker-entrypoint.sh b/images/php/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
diff --git a/src/Command/Image/GeneratePhp.php b/src/Command/Image/GeneratePhp.php
@@ -33,8 +33,6 @@ class GeneratePhp extends Command
     private const ARGUMENT_VERSION = 'version';
     private const DEFAULT_PACKAGES_PHP_FPM = [
         'apt-utils',
-        'sendmail-bin',
-        'sendmail',
         'sudo'
     ];
     private const DEFAULT_PACKAGES_PHP_CLI = [
@@ -47,8 +45,6 @@ class GeneratePhp extends Command
         'python3',
         'python3-pip',
         'redis-tools',
-        'sendmail',
-        'sendmail-bin',
         'sudo',
         'unzip',
         'vim',
diff --git a/src/Compose/BuilderInterface.php b/src/Compose/BuilderInterface.php
@@ -34,6 +34,7 @@ interface BuilderInterface
     public const SERVICE_CRON = 'cron';
     public const SERVICE_TEST = 'test';
     public const SERVICE_HEALTHCHECK = 'healthcheck';
+    public const SERVICE_MAILHOG = 'mailhog';
 
     public const NETWORK_MAGENTO = 'magento';
     public const NETWORK_MAGENTO_BUILD = 'magento-build';
diff --git a/src/Compose/ProductionBuilder.php b/src/Compose/ProductionBuilder.php
diff --git a/src/Config/Source/CloudSource.php b/src/Config/Source/CloudSource.php
diff --git a/src/Service/ServiceFactory.php b/src/Service/ServiceFactory.php
diff --git a/src/Service/ServiceInterface.php b/src/Service/ServiceInterface.php
diff --git a/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base/docker-compose.exp.yml
diff --git a/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml b/src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml
diff --git a/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml b/src/Test/Integration/_files/custom_cloud_base/docker-compose.exp.yml
