Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Elao - App - Docker] Switch to Mailpit #471

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Elao - App - Docker] Switch to Mailpit #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/elao.app.docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
FOO=BAR
docker_compose_up: true
docker_services: >
mailhog
mailpit
mariadb
elasticsearch

Expand Down
4 changes: 2 additions & 2 deletions elao.app.docker/.manala/Makefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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))
13 changes: 6 additions & 7 deletions ...docker/services/mailhog/compose.yaml.tmpl → ...docker/services/mailpit/compose.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -18,5 +17,5 @@ services:

app:
ports:
# MailHog
# Mailpit
- {{ include "project_port" (list .Vars.project 25) }}:8025
2 changes: 1 addition & 1 deletion elao.app.docker/test/goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ file:
- "# Ssh config"

http:
# MailHog
# Mailpit
http://localhost:8025:
status: 200
# Nginx
Expand Down