diff --git a/internal/compose/compose_test.go b/internal/compose/compose_test.go index 522d255..ff69582 100644 --- a/internal/compose/compose_test.go +++ b/internal/compose/compose_test.go @@ -35,7 +35,7 @@ func render(t *testing.T, s *Stack) (compose, caddy string) { func TestContainerServerIsInTheProject(t *testing.T) { c, k := render(t, stack(false)) - for _, want := range []string{"\n server:\n", "depends_on: [server]", "MAIL_SERVER_URL: http://server:8080", "inbuxa-data:/var/lib/inbuxa"} { + for _, want := range []string{"\n server:\n", "depends_on: [server]", "MAIL_SERVER_URL: http://server:8080", "inbuxa-data:/var/lib/inbuxa", "net.ipv4.ip_unprivileged_port_start: \"0\""} { if !strings.Contains(c, want) { t.Errorf("compose.yaml lacks %q", want) } diff --git a/internal/compose/templates/compose.yaml.tmpl b/internal/compose/templates/compose.yaml.tmpl index 66b473d..e28035f 100644 --- a/internal/compose/templates/compose.yaml.tmpl +++ b/internal/compose/templates/compose.yaml.tmpl @@ -26,6 +26,11 @@ services: image: {{.ServerImage}} hostname: {{.MailHost}} restart: unless-stopped + # The server runs as an unprivileged user and holds no capabilities, so + # this is what lets it listen on 25, 443, 465 and 993 inside its own + # network namespace. Docker sets it already; podman doesn't. + sysctls: + net.ipv4.ip_unprivileged_port_start: "0" ports: - "{{.ServerBind}}:8080" {{- if .PassThrough}}