diff options
| author | Joe Carstairs <me@joeac.net> | 2026-06-25 19:04:23 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-06-25 19:04:23 +0100 |
| commit | 2823433f7c3b6b8b9d20b3a54cc0e43beb534c04 (patch) | |
| tree | a9767bc3ac097cf1781e8ee951e25b7281ed2a93 | |
| parent | abfb28dea224f915e62cf400f49ce2683e564c2b (diff) | |
| parent | ebac73704b55854c297b1ac06ea695b7800dcb66 (diff) | |
Merge branch 'main' of https://git.joeac.net/joeac/joeac.net
| -rw-r--r-- | common/microlog/2026-06-25.gmi (renamed from common/microlog/2026-06-25.md) | 0 | ||||
| -rw-r--r-- | compose.yml | 7 | ||||
| -rw-r--r-- | smtp.Dockerfile | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/common/microlog/2026-06-25.md b/common/microlog/2026-06-25.gmi index 3764fc9..3764fc9 100644 --- a/common/microlog/2026-06-25.md +++ b/common/microlog/2026-06-25.gmi diff --git a/compose.yml b/compose.yml index 7bd8d93..dc91b78 100644 --- a/compose.yml +++ b/compose.yml @@ -23,12 +23,13 @@ services: context: . dockerfile: smtp.Dockerfile args: - LOCAL_SMTP_PORT: $LOCAL_SMTP_PORT + SMTP_PORT: 2500 env_file: - .env environment: - SMTP_PORT: $LOCAL_SMTP_PORT - SMTP_PASSWORD: $LOCAL_SMTP_PORT + SMTP_PORT: 2500 + SMTP_USER: smtp + SMTP_PASSWORD: smtp REMOTE_SMTP_PASSWORD_FILE: /run/secrets/remote_smtp_password secrets: - remote_smtp_password diff --git a/smtp.Dockerfile b/smtp.Dockerfile index 87c4914..d615479 100644 --- a/smtp.Dockerfile +++ b/smtp.Dockerfile @@ -1,5 +1,5 @@ FROM git.joeac.net/joeac/armv7/msmtp:1.8.32-alpine3.23 RUN apk --no-cache add gettext gnutls -ARG LOCAL_SMTP_PORT -EXPOSE $LOCAL_SMTP_PORT +ARG SMTP_PORT +EXPOSE $SMTP_PORT COPY smtp/.msmtprc ./ |