From 53030aa6a9c6022b35dd9ed59551407edd1a88b1 Mon Sep 17 00:00:00 2001 From: aya Date: Sat, 1 Aug 2026 14:21:08 +0200 Subject: [PATCH] always pass the docker network infra vars to compose (lost with default ENV_VARS removal) --- make/def.docker.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make/def.docker.mk b/make/def.docker.mk index 58eef3b..e6e57c0 100644 --- a/make/def.docker.mk +++ b/make/def.docker.mk @@ -14,6 +14,10 @@ DOCKER_NETWORK ?= $(if $(USER_STACK),$(USER),$(DOCKER_NETWORK_P DOCKER_NETWORK_DEFAULT ?= _$(COMPOSE_PROJECT_NAME) DOCKER_NETWORK_PRIVATE ?= $(USER)-$(ENV) DOCKER_NETWORK_PUBLIC ?= $(HOSTNAME) +# The myos networks.yml is appended to COMPOSE_FILE after the per-stack +# env-vars scan, so these infra vars must always reach compose or the +# external network names fall back to their placeholders. +ENV_VARS += DOCKER_NETWORK_DEFAULT DOCKER_NETWORK_PRIVATE DOCKER_NETWORK_PUBLIC # DOCKER_RUN: if empty, run system command, else run it in a docker DOCKER_RUN ?= $(if $(filter-out false False FALSE,$(DOCKER)),$(DOCKER)) DOCKER_RUN_ENTRYPOINT ?= $(patsubst %,--entrypoint=%,$(DOCKER_ENTRYPOINT))