diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-02 09:46:51 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-02 09:48:13 +0100 |
| commit | f5a6ffa8debdd78dca80662bdd2b94206c3e00c2 (patch) | |
| tree | c6f54f89f18e87c758956e4da0e92a08ffd45025 | |
| parent | d3845601e96a533f61bdcceab1d0119c5d69826e (diff) | |
COMPOSE_CMD specifies IMAGE_PREFIX
| -rw-r--r-- | make/container.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/make/container.mk b/make/container.mk index a3e23e6..f11596d 100644 --- a/make/container.mk +++ b/make/container.mk @@ -2,10 +2,11 @@ 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 REGISTRY_DOMAIN := git.joeac.net REGISTRY_USER := joeac -container_image_name = $(shell podman-compose config | yq ".services.$(module).image") +container_image_name = $(shell $(COMPOSE_CMD) config | yq ".services.$(module).image") is_containerised = $(filter $(COMPOSE_SERVICES),$(module)) has_dockerfile = $(shell test -f $(module).Dockerfile) @@ -13,7 +14,7 @@ define build_module_rule = .PHONY: build_$(module) build_$(module): $(if $(is_containerised),make_$(module) $(if $(has_dockerfile),$(module).Dockerfile)) $(if $(is_containerised),\ - IMAGE_PREFIX="$(IMAGE_PREFIX)" podman-compose build $(module)) + $(COMPOSE_CMD) build $(module)) endef define push_module_rule = |