diff --git a/make/container.mk b/make/container.mk index 46c9022..7d1633e 100644 --- a/make/container.mk +++ b/make/container.mk @@ -3,6 +3,7 @@ CPU_ARCH := $(if $(shell which arch 2>/dev/null),\ $(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/")) IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/) COMPOSE_CMD := \ + ALPINE_VERSION="$(ALPINE_VERSION)" \ IMAGE_PREFIX="$(IMAGE_PREFIX)" \ GEMINI_CERTIFICATES_DIR="$(GEMINI_CERTIFICATES_DIR)" \ GEMINI_COMITIUM_DATA_DIR="$(GEMINI_COMITIUM_DATA_DIR)" \ diff --git a/make/vars.mk b/make/vars.mk index 27044cf..0356d4e 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -34,6 +34,8 @@ export GEMINI_CERTIFICATES_DIR := /var/joeac.net-gemini/certificates export GEMINI_COMITIUM_DATA_DIR := /var/joeac.net-gemini/comitium-data export VAULTWARDEN_DATA_DIR := /var/vaultwarden/data +ALPINE_VERSION := 3.23 + $(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \ export $(call capitalise,$(module))_PORT := $(PORT_$(module))))) $(foreach hostname,$(HOSTNAMES),$(foreach module,$(MODULES_$(hostname)),$(eval \