From eaecbcf41ff5843e64ff4ac110dc26d308d035ab Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 2 Jul 2026 17:51:33 +0100 Subject: moves ports from .env to make --- make/container.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'make/container.mk') diff --git a/make/container.mk b/make/container.mk index a9758ff..ba398a7 100644 --- a/make/container.mk +++ b/make/container.mk @@ -1,8 +1,14 @@ +capitalise = $(shell _v="$(1)"; echo $${_v^^}) + CPU_ARCH := $(if $(shell which arch 2>/dev/null),\ $(shell arch),\ $(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/")) IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/) -COMPOSE_CMD := IMAGE_PREFIX="$(IMAGE_PREFIX)" podman-compose +COMPOSE_CMD := \ + IMAGE_PREFIX="$(IMAGE_PREFIX)" \ + LOCAL_SMTP_PORT=$(PORT_smtp) \ + $(foreach module,$(ALL_MODULES),$(call capitalise,$(module))_PORT=$(PORT_$(module))) \ + podman-compose REGISTRY_DOMAIN := git.joeac.net REGISTRY_USER := joeac -- cgit v1.2.3