From 1727c80a099f4ac9cdd18edf5f1de6c3cccdf3b4 Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Mon, 13 Nov 2023 11:54:31 +0000 Subject: [PATCH] Specify webroot environment variable for Mailpit. Fixes #272. --- assets/web/apache2_mailpit.conf | 8 ++++---- service.mail.yml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/assets/web/apache2_mailpit.conf b/assets/web/apache2_mailpit.conf index fa4716f6837..c2658b83afd 100644 --- a/assets/web/apache2_mailpit.conf +++ b/assets/web/apache2_mailpit.conf @@ -12,8 +12,8 @@ Redirect "/_/mail" "/_/mail/" -ProxyPass "/_/mail/api/events" "ws://mailpit:8025/api/events" -ProxyPassReverse "/_/mail/api/events" "ws://mailpit:8025/api/events" +ProxyPass "/_/mail/api/events" "ws://mailpit:8025/_/mail/api/events" +ProxyPassReverse "/_/mail/api/events" "ws://mailpit:8025/_/mail/api/events" -ProxyPass "/_/mail/" "http://mailpit:8025/" -ProxyPassReverse "/_/mail/" "http://mailpit:8025/" +ProxyPass "/_/mail/" "http://mailpit:8025/_/mail/" +ProxyPassReverse "/_/mail/" "http://mailpit:8025/_/mail/" diff --git a/service.mail.yml b/service.mail.yml index b56ba183e7a..5b91ddd1431 100644 --- a/service.mail.yml +++ b/service.mail.yml @@ -6,4 +6,6 @@ services: depends_on: - mailpit mailpit: - image: axllent/mailpit + image: axllent/mailpit:v1.10 + environment: + MP_WEBROOT: /_/mail/