From c29e6097c3e31b6fdaacaf88c8ee8433ffe7d603 Mon Sep 17 00:00:00 2001 From: Damien Broka Date: Mon, 31 Oct 2022 14:20:12 +0000 Subject: [PATCH 1/2] Add docker-compose extra flags param --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5635a5a34..e11eda610 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ postgres: $(POSTGRES_EXTRA_PATH) docker-compose.rendered.yml: docker-compose.yml docker-compose.dev.yml - $(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) -p $(STACK) config > $@ + $(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) $(DOCKER_COMPOSE_FLAGS) -p $(STACK) config > $@ deploy: docker-compose.yml $(DOCKER_COMPOSE_ENV) docker stack deploy -c $< $(STACK) From f3b81d0589ce6427cc768310dbe36d48fec66d60 Mon Sep 17 00:00:00 2001 From: Damien Broka Date: Tue, 1 Nov 2022 10:20:09 +0000 Subject: [PATCH 2/2] rename to avoid confusion --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e11eda610..a7e3a22df 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ postgres: $(POSTGRES_EXTRA_PATH) docker-compose.rendered.yml: docker-compose.yml docker-compose.dev.yml - $(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) $(DOCKER_COMPOSE_FLAGS) -p $(STACK) config > $@ + $(DOCKER_COMPOSE_ENV) $(DOCKER_COMPOSE) $(DOCKER_COMPOSE_FILES) $(DOCKER_COMPOSE_CONFIG_FLAGS) -p $(STACK) config > $@ deploy: docker-compose.yml $(DOCKER_COMPOSE_ENV) docker stack deploy -c $< $(STACK)