Merge pull request #187 from Automattic/remove-mailhog

refactor!: remove mailhog; use mailpit instead
Automattic · May 27, 2024 · f782d4a · f782d4a
2 parents 30449f4 + 1de18b8
commit f782d4a
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 137 deletions.
diff --git a/features/src/mailhog/README.md b/features/src/mailhog/README.md
diff --git a/features/src/mailhog/conf-mailhog.tpl b/features/src/mailhog/conf-mailhog.tpl
diff --git a/features/src/mailhog/devcontainer-feature.json b/features/src/mailhog/devcontainer-feature.json
diff --git a/features/src/mailhog/install.sh b/features/src/mailhog/install.sh
diff --git a/features/src/mailhog/php-mailhog.ini b/features/src/mailhog/php-mailhog.ini
diff --git a/features/src/mailhog/service-run b/features/src/mailhog/service-run
diff --git a/features/src/mailpit/devcontainer-feature.json b/features/src/mailpit/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "mailpit",
     "name": "Mailpit",
     "description": "Sets up Mailpit into the Dev Environment",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "options": {
         "enabled": {
             "type": "boolean",

diff --git a/features/src/mailpit/install.sh b/features/src/mailpit/install.sh
@@ -20,11 +20,6 @@ fi
 if [ "${ENABLED}" = "true" ]; then
     echo '(*) Installing Mailpit...'
 
-    if [ -f /usr/local/bin/mailhog ]; then
-        echo '(!) Mailpit cannot be installed along with MailHog.'
-        exit 1
-    fi
-
     ARCH="$(arch)"
     LATEST=$(curl -w '%{url_effective}' -I -L -s -S https://github.com/axllent/mailpit/releases/latest -o /dev/null | sed -e 's|.*/||')
     if [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then

diff --git a/features/src/php/devcontainer-feature.json b/features/src/php/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "php",
     "name": "PHP",
     "description": "Installs PHP into the Dev Environment",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "containerEnv": {
         "PHP_INI_DIR": "/etc/php"
     },

diff --git a/features/src/php/php.ini b/features/src/php/php.ini
@@ -17,7 +17,6 @@ realpath_cache_size = "800K"
 realpath_cache_ttl = "86400"
 disable_functions =
 sendmail_path=/bin/true
-;sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr='sendmailhog:1025'"
 
 [Date]
 date.timezone = "UTC"

diff --git a/templates/src/dev-env-ghcs/.devcontainer/devcontainer.json b/templates/src/dev-env-ghcs/.devcontainer/devcontainer.json
@@ -75,8 +75,8 @@
             "enabled": "${templateOption:vipCliEnabled}"
         },
         // Tools
-        "ghcr.io/automattic/vip-codespaces/mailhog:latest": {
-            "enabled": "${templateOption:mailhogEnabled}"
+        "ghcr.io/automattic/vip-codespaces/mailpit:latest": {
+            "enabled": "${templateOption:mailpitEnabled}"
         },
         "ghcr.io/automattic/vip-codespaces/phpmyadmin:latest": {
             "enabled": "${templateOption:pmaEnabled}"

diff --git a/templates/src/dev-env-ghcs/devcontainer-template.json b/templates/src/dev-env-ghcs/devcontainer-template.json
@@ -1,12 +1,12 @@
 {
     "id": "dev-env-ghcs",
     "name": "VIP Development Environment",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "options": {
-        "mailhogEnabled": {
+        "mailpitEnabled": {
             "type": "boolean",
             "default": false,
-            "description": "Enable Mailhog"
+            "description": "Enable Mailpit"
         },
         "memcachedEnabled": {
             "type": "boolean",
@@ -15,8 +15,8 @@
         },
         "phpVersion": {
             "type": "string",
-            "enum": ["8.0", "8.1", "8.2"],
-            "default": "8.0",
+            "enum": ["8.1", "8.2", "8.3"],
+            "default": "8.2",
             "description": "PHP version"
         },
         "wordpressVersion": {

diff --git a/templates/src/dev-env-vsc/.devcontainer/devcontainer.json b/templates/src/dev-env-vsc/.devcontainer/devcontainer.json
@@ -72,8 +72,8 @@
             "enabled": "${templateOption:vipCliEnabled}"
         },
         // Tools
-        "ghcr.io/automattic/vip-codespaces/mailhog:latest": {
-            "enabled": "${templateOption:mailhogEnabled}"
+        "ghcr.io/automattic/vip-codespaces/mailpit:latest": {
+            "enabled": "${templateOption:mailpitEnabled}"
         },
         "ghcr.io/automattic/vip-codespaces/phpmyadmin:latest": {
             "enabled": "${templateOption:pmaEnabled}"

diff --git a/templates/src/dev-env-vsc/devcontainer-template.json b/templates/src/dev-env-vsc/devcontainer-template.json
@@ -1,12 +1,12 @@
 {
     "id": "dev-env-vsc",
     "name": "VIP Development Environment (VSCode/devcontainers)",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "options": {
-        "mailhogEnabled": {
+        "mailpitEnabled": {
             "type": "boolean",
             "default": false,
-            "description": "Enable Mailhog"
+            "description": "Enable Mailpit"
         },
         "memcachedEnabled": {
             "type": "boolean",
@@ -15,8 +15,8 @@
         },
         "phpVersion": {
             "type": "string",
-            "enum": ["8.0", "8.1", "8.2"],
-            "default": "8.0",
+            "enum": ["8.1", "8.2", "8.3"],
+            "default": "8.3",
             "description": "PHP version"
         },
         "wordpressVersion": {