From e0170e82aacf68aaf5d9896df9fdbea454e4725f Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Thu, 8 Jan 2026 21:10:08 +0000
Subject: [PATCH] fixes SMTP server

---
 smtp/.msmtprc   | 12 ++++++++++++
 smtp/Dockerfile | 20 +++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 smtp/.msmtprc

diff --git a/smtp/.msmtprc b/smtp/.msmtprc
new file mode 100644
index 0000000..1578901
--- /dev/null
+++ b/smtp/.msmtprc
@@ -0,0 +1,12 @@
+defaults
+auth             on
+tls              on
+tls_trust_file   /etc/ssl/certs/ca-certificates.crt
+logfile          /var/msmtp/msmtp.log
+
+account          default
+eval echo from   "$LOCAL_SMTP_ENVELOPE_FROM"
+eval echo host   "$REMOTE_SMTP_HOST"
+eval echo port   "$REMOTE_SMTP_PORT"
+eval echo user   "$REMOTE_SMTP_USER"
+passwordeval     cat "$REMOTE_SMTP_PASSWORD_FILE"
diff --git a/smtp/Dockerfile b/smtp/Dockerfile
index 093087a..4cdc095 100644
--- a/smtp/Dockerfile
+++ b/smtp/Dockerfile
@@ -1,13 +1,23 @@
 FROM alpine:3.22
 
 WORKDIR /
-RUN apk add --no-cache git autoconf automake build-base gettext gettext-dev gnutls-dev libtool make texinfo
-RUN git clone https://github.com/marlam/msmtp.git --branch msmtp-1.8.32 --single-branch --depth 1
+RUN mkdir -p /var/msmtp
+RUN apk --update --no-cache add git autoconf automake build-base gettext gettext-dev gnutls-dev libtool make texinfo && \
+  git clone https://github.com/marlam/msmtp.git --branch msmtp-1.8.32 --single-branch --depth 1
 WORKDIR /msmtp
 RUN autoreconf -fi && \
   ./configure && \
   make && \
   make install
-ARG PORT=2500
-EXPOSE $PORT
-CMD ["msmtpd", "--port=$PORT"]
+
+ARG LOCAL_SMTP_PORT
+EXPOSE $LOCAL_SMTP_PORT
+
+COPY .msmtprc ./
+
+CMD msmtpd \
+  --auth=$LOCAL_SMTP_USER,'echo $LOCAL_SMTP_PASSWORD' \
+  --command='msmtp -C .msmtprc -f %F --' \
+  --interface=0.0.0.0 \
+  --log=/var/msmtp/msmtpd.log \
+  --port=$LOCAL_SMTP_PORT