From 3d6bdf5772503872e63aa1d056a1e44844e95a43 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Tue, 11 Aug 2026 22:07:33 +0100 Subject: can't install http/smtp with Make/Podman --- compose.yml | 45 --------------------------------------------- http.Dockerfile | 13 ------------- make/vars.mk | 7 ++----- smtp.Dockerfile | 5 ----- smtp/.msmtprc | 12 ------------ smtp/Makefile | 7 ------- 6 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 http.Dockerfile delete mode 100644 smtp.Dockerfile delete mode 100644 smtp/.msmtprc delete mode 100644 smtp/Makefile diff --git a/compose.yml b/compose.yml index 22c7381..e3d92f8 100644 --- a/compose.yml +++ b/compose.yml @@ -19,48 +19,3 @@ services: volumes: - ${GEMINI_CERTIFICATES_DIR}:/var/app/.certificates - ${GEMINI_COMITIUM_DATA_DIR}:/var/app/comitium-data - - http: - image: git.joeac.net/joeac/${IMAGE_PREFIX}joeac.net-http - container_name: joeac.net-http - build: - context: . - dockerfile: http.Dockerfile - environment: - MAX_DAILY_EMAILS: ${MAX_DAILY_EMAILS} - CONTACT_MAILBOX: ${CONTACT_MAILBOX} - CONTACT_MAILBOX_NAME: ${CONTACT_MAILBOX_NAME} - LOCAL_SMTP_FROM: ${LOCAL_SMTP_FROM} - LOCAL_SMTP_FROM_NAME: ${LOCAL_SMTP_FROM_NAME} - LOCAL_SMTP_HOST: ${LOCAL_SMTP_HOST} - LOCAL_SMTP_PORT: ${LOCAL_SMTP_PORT} - LOCAL_SMTP_USER: ${LOCAL_SMTP_USER} - LOCAL_SMTP_PASSWORD: ${LOCAL_SMTP_PASSWORD} - DB_SCHEME: ${DB_SCHEME} - DB_PATH: ${DB_PATH} - ports: - - "${HTTP_PORT}:80" - - smtp: - image: git.joeac.net/joeac/${IMAGE_PREFIX}joeac.net-smtp - container_name: joeac.net-smtp - build: - context: . - dockerfile: smtp.Dockerfile - args: - SMTP_PORT: ${LOCAL_SMTP_PORT} - environment: - LOCAL_SMTP_ENVELOPE_FROM: ${LOCAL_SMTP_ENVELOPE_FROM} - REMOTE_SMTP_HOST: ${REMOTE_SMTP_HOST} - REMOTE_SMTP_PORT: ${REMOTE_SMTP_PORT} - REMOTE_SMTP_USER: ${REMOTE_SMTP_USER} - SMTP_PORT: ${LOCAL_SMTP_PORT} - SMTP_USER: ${LOCAL_SMTP_USER} - SMTP_PASSWORD: ${LOCAL_SMTP_PASSWORD} - REMOTE_SMTP_PASSWORD_FILE: /run/secrets/remote_smtp_password - secrets: - - remote_smtp_password - -secrets: - remote_smtp_password: - external: true diff --git a/http.Dockerfile b/http.Dockerfile deleted file mode 100644 index 490052c..0000000 --- a/http.Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM docker.io/arm32v7/nginx:1.30.3-alpine3.23 -RUN apk --update add php85-fpm php85-pdo php85-pdo_sqlite -COPY http/vendor /usr/share/nginx/vendor -COPY http/php /usr/share/nginx/php -COPY http/out /usr/share/nginx/html -COPY http/php-fpm.conf /etc/php85/php-fpm.d/joeac.net-http_pool.conf -COPY http/nginx.conf /etc/nginx/nginx.conf -CMD mkdir -p "$(dirname "$DB_PATH")" \ - && touch $DB_PATH \ - && chown -R nginx:nginx "$(dirname "$DB_PATH")" \ - && chmod -R 700 "$(dirname "$DB_PATH")" \ - && php-fpm85 \ - && nginx -g "daemon off;" diff --git a/make/vars.mk b/make/vars.mk index 1eb3d93..9b8e878 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -7,9 +7,9 @@ IP_ADDR_pi-broughton := 192.168.178.91 IP_ADDR_blade-canongate := 192.168.178.75 MASTER_NODE := blade-canongate IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME)) -MODULES_pi-broughton := actualbudget http smtp vaultwarden +MODULES_pi-broughton := actualbudget vaultwarden MODULES_blade-canongate := etherpad gemini -ALL_NGINX_MODULES := actualbudget http vaultwarden etherpad +ALL_NGINX_MODULES := actualbudget vaultwarden etherpad NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_NGINX_MODULES)) MODULES := $(MODULES_$(HOSTNAME)) ALL_MODULES := $(sort $(foreach hostname,$(HOSTNAMES),$(MODULES_$(hostname)))) @@ -19,12 +19,10 @@ MAKE_MODULES := $(foreach module,$(MODULES),\ $(shell [ -f $(module)/Makefile ] && echo $(module))) SUBDOMAIN_actualbudget := budget -SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs PORT_actualbudget := 5006 -PORT_http := 8080 PORT_gemini := 1965 PORT_smtp := 2500 PORT_vaultwarden := 9000 @@ -63,6 +61,5 @@ COMPOSE_CMD := \ GEMINI_CERTIFICATES_DIR="$(GEMINI_CERTIFICATES_DIR)" \ GEMINI_COMITIUM_DATA_DIR="$(GEMINI_COMITIUM_DATA_DIR)" \ VAULTWARDEN_DATA_DIR="$(VAULTWARDEN_DATA_DIR)" \ - LOCAL_SMTP_PORT=$(PORT_smtp) \ $(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \ podman-compose diff --git a/smtp.Dockerfile b/smtp.Dockerfile deleted file mode 100644 index d615479..0000000 --- a/smtp.Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM git.joeac.net/joeac/armv7/msmtp:1.8.32-alpine3.23 -RUN apk --no-cache add gettext gnutls -ARG SMTP_PORT -EXPOSE $SMTP_PORT -COPY smtp/.msmtprc ./ diff --git a/smtp/.msmtprc b/smtp/.msmtprc deleted file mode 100644 index 1578901..0000000 --- a/smtp/.msmtprc +++ /dev/null @@ -1,12 +0,0 @@ -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/Makefile b/smtp/Makefile deleted file mode 100644 index cbbf7e1..0000000 --- a/smtp/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: Makefile - -Makefile: Makefile - echo "Nothing to be done for smtp: this Makefile is a placeholder." - -clean: - echo "Nothing to be cleaned up for smtp: this rule is a placeholder." -- cgit v1.2.3