From 1fba2c07e50a5a28dd82bd9c73634a60079a1daf Mon Sep 17 00:00:00 2001
From: Florian Rey <nervo@nervo.net>
Date: Fri, 22 Nov 2024 06:54:16 +0100
Subject: [PATCH] [Elao - App - Docker] Switch to Mailpit

---
 .github/workflows/elao.app.docker.yaml              |  2 +-
 elao.app.docker/.manala/Makefile.tmpl               |  4 ++--
 .../services/{mailhog => mailpit}/compose.yaml.tmpl | 13 ++++++-------
 elao.app.docker/test/goss.yaml                      |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)
 rename elao.app.docker/.manala/docker/services/{mailhog => mailpit}/compose.yaml.tmpl (59%)

diff --git a/.github/workflows/elao.app.docker.yaml b/.github/workflows/elao.app.docker.yaml
index db78c76f..e23bd5f2 100644
--- a/.github/workflows/elao.app.docker.yaml
+++ b/.github/workflows/elao.app.docker.yaml
@@ -61,7 +61,7 @@ jobs:
             FOO=BAR
           docker_compose_up: true
           docker_services: >
-            mailhog
+            mailpit
             mariadb
             elasticsearch
 
diff --git a/elao.app.docker/.manala/Makefile.tmpl b/elao.app.docker/.manala/Makefile.tmpl
index e37bd7ef..3f3eed9b 100644
--- a/elao.app.docker/.manala/Makefile.tmpl
+++ b/elao.app.docker/.manala/Makefile.tmpl
@@ -52,7 +52,7 @@ MANALA_DOCKER_DEFAULT_SERVICES += elasticsearch
 {{- end }}
 
 ifeq ($(MANALA_DOCKER_COMPOSE_PROFILE),development)
-MANALA_DOCKER_DEFAULT_SERVICES += mailhog
+MANALA_DOCKER_DEFAULT_SERVICES += mailpit
 {{- if or .Vars.system.mysql.version .Vars.system.mariadb.version }}
 MANALA_DOCKER_DEFAULT_SERVICES += phpmyadmin
 {{- end }}
@@ -315,4 +315,4 @@ MANALA_HELP_PROJECT += $(call manala_help,Elasticvue,   http://$(call manala_pro
 {{- if .Vars.system.redis.version }}
 MANALA_HELP_PROJECT += $(call manala_help,PhpRedisAdmin,http://$(call manala_project_host, 81))
 {{- end }}
-MANALA_HELP_PROJECT += $(call manala_help,MailHog,      http://$(call manala_project_host, 25))
+MANALA_HELP_PROJECT += $(call manala_help,Mailpit,      http://$(call manala_project_host, 25))
diff --git a/elao.app.docker/.manala/docker/services/mailhog/compose.yaml.tmpl b/elao.app.docker/.manala/docker/services/mailpit/compose.yaml.tmpl
similarity index 59%
rename from elao.app.docker/.manala/docker/services/mailhog/compose.yaml.tmpl
rename to elao.app.docker/.manala/docker/services/mailpit/compose.yaml.tmpl
index 78e7664d..10580957 100644
--- a/elao.app.docker/.manala/docker/services/mailhog/compose.yaml.tmpl
+++ b/elao.app.docker/.manala/docker/services/mailpit/compose.yaml.tmpl
@@ -1,14 +1,13 @@
 services:
 
     ###########
-    # MailHog #
+    # Mailpit #
     ###########
 
-    mailhog:
-        image: jcalonso/mailhog:v1.0.1
-        entrypoint:
-            - /MailHog
-            - -smtp-bind-addr
+    mailpit:
+        image: axllent/mailpit:v1.21.4
+        command:
+            - --smtp
             - 0.0.0.0:25
         network_mode: service:app
 
@@ -18,5 +17,5 @@ services:
 
     app:
         ports:
-            # MailHog
+            # Mailpit
             - {{ include "project_port" (list .Vars.project 25) }}:8025
diff --git a/elao.app.docker/test/goss.yaml b/elao.app.docker/test/goss.yaml
index 0884a8a3..d57aef65 100644
--- a/elao.app.docker/test/goss.yaml
+++ b/elao.app.docker/test/goss.yaml
@@ -161,7 +161,7 @@ file:
       - "# Ssh config"
 
 http:
-  # MailHog
+  # Mailpit
   http://localhost:8025:
     status: 200
   # Nginx