diff options
| author | Joe Carstairs <me@joeac.net> | 2026-05-08 08:38:35 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-05-08 08:38:35 +0100 |
| commit | 92137412c3db3ee1404da0a34f33216aca612f4e (patch) | |
| tree | 170cd0b9726a485e213421dc6e9038526ea80e0b | |
| parent | af7c620129a0e4f75f0e5ae195b46387d2237fd3 (diff) | |
| parent | da09e09caaa46f0f3b352d7afed1a22e5ce95f2c (diff) | |
Merge branch 'main' of https://git.joeac.net/joeac/joeac.net
| -rw-r--r-- | compose.yml | 6 | ||||
| -rw-r--r-- | website.Dockerfile | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/compose.yml b/compose.yml index dd0d93c..e192b2f 100644 --- a/compose.yml +++ b/compose.yml @@ -1,6 +1,6 @@ services: capsule: - image: git.joeac.net/joeac/capsule + image: git.joeac.net/joeac/joeac.net-capsule build: context: . dockerfile: capsule.Dockerfile @@ -8,7 +8,7 @@ services: - "1965:1965" website: - image: git.joeac.net/joeac/website + image: git.joeac.net/joeac/joeac.net-website build: context: . dockerfile: website.Dockerfile @@ -22,7 +22,7 @@ services: - "8000:4321" smtp: - image: git.joeac.net/joeac/smtp + image: git.joeac.net/joeac/joeac.net-smtp build: context: smtp args: diff --git a/website.Dockerfile b/website.Dockerfile index fd55f54..7ace22f 100644 --- a/website.Dockerfile +++ b/website.Dockerfile @@ -24,15 +24,6 @@ EXPOSE 4321 ARG LOCAL_SMTP_HOST ARG LOCAL_SMTP_PASSWORD ARG LOCAL_SMTP_PORT -#ENV LOCAL_SMTP_ENVELOPE_FROM=$LOCAL_SMTP_ENVELOPE_FROM \ -#ENV LOCAL_SMTP_USER=$LOCAL_SMTP_USER \ -#LOCAL_SMTP_HOST=$LOCAL_SMTP_HOST \ -#LOCAL_SMTP_PASSWORD=$LOCAL_SMTP_PASSWORD \ -# LOCAL_SMTP_PORT=$LOCAL_SMTP_PORT \ -# REMOTE_SMTP_HOST=$REMOTE_SMTP_HOST \ -# REMOTE_SMTP_PORT=$REMOTE_SMTP_PORT \ -# REMOTE_SMTP_USER=$REMOTE_SMTP_USER \ -# MAX_DAILY_EMAILS=$MAX_DAILY_EMAILS RUN npm run build && rm -rf public src |