From 9f7f983775a5a316e84b12ee192fb68494c37de9 Mon Sep 17 00:00:00 2001 From: Florian Rey Date: Fri, 22 Nov 2024 06:54:16 +0100 Subject: [PATCH] [Elao - App - Docker] Switch to Mailpit --- elao.app.docker/.manala/Makefile.tmpl | 4 ++-- .../services/{mailhog => mailpit}/compose.yaml.tmpl | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) rename elao.app.docker/.manala/docker/services/{mailhog => mailpit}/compose.yaml.tmpl (59%) 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