Replace all mailhog references with mailpit.

- Update CircleCI orb to check for freegle-mailpit container
- Update docker-compose.yml SMTP_HOST and MAIL_HOST env vars
- Remove mailhog network alias and traefik backward compat
- Update status server, test files, and documentation
- Remove obsolete MailHogHelper.php test helper

Author: edwh

.circleci/orb/freegle-tests.yml

@@ -94,7 +94,7 @@ commands:
             echo ""
             echo "=== Verifying container names ==="
             # All containers that have container_name set in docker-compose.yml
-            ALL_CONTAINERS="freegle-traefik freegle-percona freegle-postgres freegle-phpmyadmin freegle-mailhog freegle-beanstalkd freegle-spamassassin freegle-redis freegle-delivery freegle-tusd freegle-status freegle-host-scripts freegle-apiv1 freegle-apiv2 freegle-batch freegle-dev-local freegle-prod-local modtools-dev-local modtools-prod-local freegle-playwright"
+            ALL_CONTAINERS="freegle-traefik freegle-percona freegle-postgres freegle-phpmyadmin freegle-mailpit freegle-beanstalkd freegle-spamassassin freegle-redis freegle-delivery freegle-tusd freegle-status freegle-host-scripts freegle-apiv1 freegle-apiv2 freegle-batch freegle-dev-local freegle-prod-local modtools-dev-local modtools-prod-local freegle-playwright"
             MISSING=""
             for container in $ALL_CONTAINERS; do
               if docker inspect "$container" >/dev/null 2>&1; then

Dockerfile.base

@@ -39,7 +39,7 @@ ENV PATH="/usr/local/go/bin:/root/go/bin:${PATH}" \
 
 # ============ PHP 8.1 + WEB SERVER ============
 # nginx: serves PHP API via php-fpm
-# postfix: mail relay for sending emails (configured to use mailhog)
+# postfix: mail relay for sending emails (configured to use mailpit)
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
     apt-get update && apt-get install -y --no-install-recommends \

README.md

@@ -42,7 +42,7 @@ Add these to your hosts file:
 127.0.0.1 modtools-dev.localhost
 127.0.0.1 modtools-prod.localhost
 127.0.0.1 phpmyadmin.localhost
-127.0.0.1 mailhog.localhost
+127.0.0.1 mailpit.localhost
 127.0.0.1 tusd.localhost
 127.0.0.1 status.localhost
 127.0.0.1 apiv1.localhost
@@ -260,7 +260,7 @@ You can see this via 'Pending' calls in the Network tab.
 
 ## Development Tools
 * **[PhpMyAdmin](https://phpmyadmin.localhost)** - Database management (Login: `root` / `iznik`)
-* **[MailHog](https://mailhog.localhost)** - Email testing interface
+* **[Mailpit](https://mailpit.localhost)** - Email testing interface
 * **[TusD](https://tusd.localhost)** - Image upload service
 * **[Image Delivery](https://delivery.localhost)** - Image processing service (weserv/images)
 * **[Traefik Dashboard](http://localhost:8080)** - Reverse proxy dashboard

docker-compose.yml

@@ -102,9 +102,7 @@ services:
     image: axllent/mailpit:latest
     container_name: freegle-mailpit
     networks:
-      default:
-        aliases:
-          - mailhog
+      - default
     ports:
       - "0.0.0.0:8025:8025"
       - "0.0.0.0:1025:1025"
@@ -135,7 +133,7 @@ services:
       start_period: 10s
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.mailpit.rule=Host(`mailpit.localhost`) || Host(`mailhog.localhost`)"
+      - "traefik.http.routers.mailpit.rule=Host(`mailpit.localhost`)"
       - "traefik.http.routers.mailpit.entrypoints=web"
       - "traefik.http.services.mailpit.loadbalancer.server.port=8025"
 
@@ -407,7 +405,7 @@ services:
       - IMAGE_DOMAIN=apiv1
       - SPAMD_HOST=spamassassin-app
       - SPAMD_PORT=783
-      - SMTP_HOST=mailhog
+      - SMTP_HOST=mailpit
       - TUS_UPLOADER=http://freegle-tusd:8080/tus
       - SMTP_PORT=1025
       - IMAGE_DELIVERY=http://freegle-delivery
@@ -946,7 +944,7 @@ services:
       - QUEUE_CONNECTION=redis
       - SESSION_DRIVER=redis
       - MAIL_MAILER=smtp
-      - MAIL_HOST=mailhog
+      - MAIL_HOST=mailpit
       - MAIL_PORT=1025
       - MAIL_ENCRYPTION=null
       - MAIL_EHLO_DOMAIN=freegle-batch

iznik-batch/.env.testing

@@ -37,9 +37,9 @@ QUEUE_CONNECTION=database
 
 CACHE_STORE=file
 
-# Mail - use MailHog for local testing
+# Mail - use Mailpit for local testing
 MAIL_MAILER=smtp
-MAIL_HOST=mailhog
+MAIL_HOST=mailpit
 MAIL_PORT=1025
 MAIL_USERNAME=null
 MAIL_PASSWORD=null

iznik-batch/CLAUDE.md

@@ -27,7 +27,7 @@ All domain-specific configuration is in `config/freegle.php` and can be overridd
 # Run all unit and feature tests (uses iznik_test database)
 docker exec freegle-batch php artisan test --testsuite=Unit,Feature
 
-# Run integration tests (requires MailHog)
+# Run integration tests (requires Mailpit)
 docker exec freegle-batch php artisan test --testsuite=Integration
 
 # Run specific test
@@ -38,7 +38,7 @@ docker exec freegle-batch php artisan test --filter="test_method_name"
 
 - **Unit** - Unit tests using iznik_batch_test database
 - **Feature** - Feature tests using iznik_batch_test database
-- **Integration** - Tests that require external services (MailHog)
+- **Integration** - Tests that require external services (Mailpit)
 
 ## Database Migrations
 

iznik-batch/tests/Feature/Mail/ChatNotificationIntegrationTest.php

@@ -38,7 +38,7 @@ protected function setUp(): void
         $this->testRunId = uniqid("chat_", TRUE);
 
         Config::set("mail.default", "smtp");
-        Config::set("mail.mailers.smtp.host", "mailhog");
+        Config::set("mail.mailers.smtp.host", "mailpit");
         Config::set("mail.mailers.smtp.port", 1025);
 
         Config::set("freegle.spam_check.enabled", true);
@@ -47,7 +47,7 @@ protected function setUp(): void
         Config::set("freegle.spam_check.rspamd_host", "rspamd");
         Config::set("freegle.spam_check.rspamd_port", 11334);
 
-        $this->mailpit = new MailpitHelper("http://mailhog:8025");
+        $this->mailpit = new MailpitHelper("http://mailpit:8025");
         $this->mailpit->deleteAllMessages();
     }
 
@@ -302,7 +302,7 @@ public function test_user2mod_notification_passes_spam_checks(): void
     protected function isMailpitAvailable(): bool
     {
         try {
-            $ch = curl_init("http://mailhog:8025/api/v1/messages");
+            $ch = curl_init("http://mailpit:8025/api/v1/messages");
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);
             curl_setopt($ch, CURLOPT_TIMEOUT, 5);

iznik-batch/tests/Feature/Mail/WelcomeMailIntegrationTest.php

@@ -32,7 +32,7 @@ protected function setUp(): void
 
         // Configure for actual SMTP sending (override phpunit.xml array mailer).
         Config::set('mail.default', 'smtp');
-        Config::set('mail.mailers.smtp.host', 'mailhog');
+        Config::set('mail.mailers.smtp.host', 'mailpit');
         Config::set('mail.mailers.smtp.port', 1025);
 
         // Enable spam checking.
@@ -43,7 +43,7 @@ protected function setUp(): void
         Config::set('freegle.spam_check.rspamd_port', 11334);
 
         // Set up Mailpit helper with docker network URL.
-        $this->mailpit = new MailpitHelper('http://mailhog:8025');
+        $this->mailpit = new MailpitHelper('http://mailpit:8025');
 
         // Clear all messages before each test.
         $this->mailpit->deleteAllMessages();
@@ -264,7 +264,7 @@ public function test_welcome_email_passes_spam_checks(): void
     protected function isMailpitAvailable(): bool
     {
         try {
-            $ch = curl_init('http://mailhog:8025/api/v1/messages');
+            $ch = curl_init('http://mailpit:8025/api/v1/messages');
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
             curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 2);
             curl_setopt($ch, CURLOPT_TIMEOUT, 5);

iznik-batch/tests/Feature/Mail/WelcomeMailTest.php

@@ -4,19 +4,19 @@
 
 use App\Mail\Welcome\WelcomeMail;
 use Illuminate\Support\Facades\Mail;
-use Tests\Support\MailHogHelper;
+use Tests\Support\MailpitHelper;
 use Tests\TestCase;
 
 class WelcomeMailTest extends TestCase
 {
-    protected MailHogHelper $mailHog;
+    protected MailpitHelper $mailpit;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        // Set up MailHog helper with docker network URL.
-        $this->mailHog = new MailHogHelper('http://mailhog:8025');
+        // Set up Mailpit helper with docker network URL.
+        $this->mailpit = new MailpitHelper('http://mailpit:8025');
     }
 
     /**