diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/container.mk | 8 | ||||
| -rw-r--r-- | make/vars.mk | 5 |
2 files changed, 12 insertions, 1 deletions
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 diff --git a/make/vars.mk b/make/vars.mk index f7ec98d..9f7a701 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -2,6 +2,11 @@ SUBDOMAIN_http := @ SUBDOMAIN_vaultwarden := pwd SUBDOMAIN_etherpad := docs SUBDOMAIN_ln := ln +PORT_etherpad := 9001 +PORT_http := 8080 +PORT_gemini := 1965 +PORT_smtp := 2500 +PORT_vaultwarden := 9000 HOSTNAME := $(shell cat /etc/hostname) HOSTNAMES := pi-broughton blade-canongate MODULES_pi-broughton := http gemini smtp vaultwarden ln |