From 785f1cb5d56f7f519753708be8b471d0c90cedae Mon Sep 17 00:00:00 2001
From: Andrew Smith <a.smith@silentworks.co.uk>
Date: Sun, 9 Feb 2025 18:46:55 +0000
Subject: [PATCH] fix: add mailpit image

---
 internal/start/start.go | 15 ++++++---------
 pkg/config/constants.go |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/internal/start/start.go b/internal/start/start.go
index 1fdaf1ebe..eef001635 100644
--- a/internal/start/start.go
+++ b/internal/start/start.go
@@ -514,7 +514,7 @@ EOF
 		} else if utils.Config.Inbucket.Enabled {
 			env = append(env,
 				"GOTRUE_SMTP_HOST="+utils.InbucketId,
-				"GOTRUE_SMTP_PORT=2500",
+				"GOTRUE_SMTP_PORT=1025",
 				fmt.Sprintf("GOTRUE_SMTP_ADMIN_EMAIL=%s", utils.Config.Inbucket.AdminEmail),
 				fmt.Sprintf("GOTRUE_SMTP_SENDER_NAME=%s", utils.Config.Inbucket.SenderName),
 			)
@@ -696,14 +696,14 @@ EOF
 		started = append(started, utils.GotrueId)
 	}
 
-	// Start Inbucket.
+	// Start Mailpit
 	if utils.Config.Inbucket.Enabled && !isContainerExcluded(utils.Config.Inbucket.Image, excluded) {
-		inbucketPortBindings := nat.PortMap{"9000/tcp": []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.Port), 10)}}}
+		inbucketPortBindings := nat.PortMap{"8025/tcp": []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.Port), 10)}}}
 		if utils.Config.Inbucket.SmtpPort != 0 {
-			inbucketPortBindings["2500/tcp"] = []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.SmtpPort), 10)}}
+			inbucketPortBindings["1025/tcp"] = []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.SmtpPort), 10)}}
 		}
 		if utils.Config.Inbucket.Pop3Port != 0 {
-			inbucketPortBindings["1100/tcp"] = []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.Pop3Port), 10)}}
+			inbucketPortBindings["1110/tcp"] = []nat.PortBinding{{HostPort: strconv.FormatUint(uint64(utils.Config.Inbucket.Pop3Port), 10)}}
 		}
 		if _, err := utils.DockerStart(
 			ctx,
@@ -712,10 +712,7 @@ EOF
 			},
 			container.HostConfig{
 				Binds: []string{
-					// Override default mount points to avoid creating multiple anonymous volumes
-					// Ref: https://github.com/inbucket/inbucket/blob/v3.0.4/Dockerfile#L52
-					utils.InbucketId + ":/config",
-					utils.InbucketId + ":/storage",
+					utils.InbucketId + ":/data",
 				},
 				PortBindings:  inbucketPortBindings,
 				RestartPolicy: container.RestartPolicy{Name: "always"},
diff --git a/pkg/config/constants.go b/pkg/config/constants.go
index 1972e8240..b43a7de72 100644
--- a/pkg/config/constants.go
+++ b/pkg/config/constants.go
@@ -7,7 +7,7 @@ const (
 	// Append to ServiceImages when adding new dependencies below
 	// TODO: try https://github.com/axllent/mailpit
 	kongImage        = "library/kong:2.8.1"
-	inbucketImage    = "inbucket/inbucket:3.0.3"
+	inbucketImage    = "axllent/mailpit:v1.22.2"
 	postgrestImage   = "postgrest/postgrest:v12.2.0"
 	pgmetaImage      = "supabase/postgres-meta:v0.84.2"
 	studioImage      = "supabase/studio:20250130-b048539"