MCLOUD-6898: Add option to customize port for MailHog

Author: BaDos

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

@@ -40,13 +40,9 @@ touch $CRON_LOG
 
 PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
-if [ -z "${MAILHOG_SMTP_PORT}" ]; then
-    MAILHOG_SMTP_PORT=1025
-fi
-
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:${MAILHOG_SMTP_PORT}\"/" ${PHP_EXT_DIR}/zz-mail.ini
+    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/docker-entrypoint.sh

@@ -40,13 +40,9 @@ touch $CRON_LOG
 
 PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
-if [ -z "${MAILHOG_SMTP_PORT}" ]; then
-    MAILHOG_SMTP_PORT=1025
-fi
-
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:${MAILHOG_SMTP_PORT}\"/" ${PHP_EXT_DIR}/zz-mail.ini
+    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/docker-entrypoint.sh

@@ -40,13 +40,9 @@ touch $CRON_LOG
 
 PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
-if [ -z "${MAILHOG_SMTP_PORT}" ]; then
-    MAILHOG_SMTP_PORT=1025
-fi
-
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:${MAILHOG_SMTP_PORT}\"/" ${PHP_EXT_DIR}/zz-mail.ini
+    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/cli/docker-entrypoint.sh

@@ -40,13 +40,9 @@ touch $CRON_LOG
 
 PHP_EXT_DIR=/usr/local/etc/php/conf.d
 
-if [ -z "${MAILHOG_SMTP_PORT}" ]; then
-    MAILHOG_SMTP_PORT=1025
-fi
-
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
-    sed -i "s/!SENDMAIL_PATH!/\"\/usr\/local\/bin\/mhsendmail --smtp-addr=mailhog:${MAILHOG_SMTP_PORT}\"/" ${PHP_EXT_DIR}/zz-mail.ini
+    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