From a76194c493d107f4b9f353e276f277bc3b96554b Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Thu, 19 Aug 2021 12:30:38 -0400 Subject: [PATCH] Add new COMPOSE_OPTS variable to docker-compose up target Signed-off-by: Christian M. Adams --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 90010b02da..519a21b007 100644 --- a/Makefile +++ b/Makefile @@ -470,6 +470,7 @@ awx/projects: @mkdir -p $@ COMPOSE_UP_OPTS ?= +COMPOSE_OPTS ?= CLUSTER_NODE_COUNT ?= 1 MINIKUBE_CONTAINER_GROUP ?= false @@ -486,7 +487,7 @@ docker-compose-sources: .git/hooks/pre-commit docker-compose: docker-auth awx/projects docker-compose-sources - docker-compose -f tools/docker-compose/_sources/docker-compose.yml up $(COMPOSE_UP_OPTS) + docker-compose -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) docker-compose-credential-plugins: docker-auth awx/projects docker-compose-sources echo -e "\033[0;31mTo generate a CyberArk Conjur API key: docker exec -it tools_conjur_1 conjurctl account create quick-start\033[0m"