From ad4b03871ecb43596df6c33a98642699b006532d Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Sat, 4 Jul 2026 20:11:07 +0100
Subject: [PATCH] moves container.mk vars to vars.mk so that IMAGE_PREFIX is
 defined before it is used in COMPOSE_CMD

---
 make/container.mk | 4 ----
 make/vars.mk      | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/make/container.mk b/make/container.mk
index 323ef58..4c6702a 100644
--- a/make/container.mk
+++ b/make/container.mk
@@ -1,7 +1,3 @@
-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/)
 REGISTRY_DOMAIN := git.joeac.net
 REGISTRY_USER := joeac
 
diff --git a/make/vars.mk b/make/vars.mk
index d3be3b7..12f93f7 100644
--- a/make/vars.mk
+++ b/make/vars.mk
@@ -55,6 +55,10 @@ INSTALL_RULES := $(foreach module,$(MODULES),install_$(module))
 REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module))
 UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
 
+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 := \
 	ALPINE_VERSION="$(ALPINE_VERSION)" \
 	IMAGE_PREFIX="$(IMAGE_PREFIX)" \