aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

always pass the docker network infra vars to compose (lost with default ENV_VARS removal)

Browse Source
This commit is contained in:
aya
2026-08-01 14:21:08 +02:00
parent 181a3e9fc0
commit 53030aa6a9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/def.docker.mk
+4
View File
@@ -14,6 +14,10 @@ DOCKER_NETWORK ?= $(if $(USER_STACK),$(USER),$(DOCKER_NETWORK_P
DOCKER_NETWORK_DEFAULT ?= _$(COMPOSE_PROJECT_NAME) DOCKER_NETWORK_DEFAULT ?= _$(COMPOSE_PROJECT_NAME)
DOCKER_NETWORK_PRIVATE ?= $(USER)-$(ENV) DOCKER_NETWORK_PRIVATE ?= $(USER)-$(ENV)
DOCKER_NETWORK_PUBLIC ?= $(HOSTNAME) 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 empty, run system command, else run it in a docker
DOCKER_RUN ?= $(if $(filter-out false False FALSE,$(DOCKER)),$(DOCKER)) DOCKER_RUN ?= $(if $(filter-out false False FALSE,$(DOCKER)),$(DOCKER))
DOCKER_RUN_ENTRYPOINT ?= $(patsubst %,--entrypoint=%,$(DOCKER_ENTRYPOINT)) DOCKER_RUN_ENTRYPOINT ?= $(patsubst %,--entrypoint=%,$(DOCKER_ENTRYPOINT))