From 57c9b14198f98ffce2a2d7d823d52940dd802c19 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sun, 3 Oct 2021 13:40:26 -0400 Subject: [PATCH] Fix docker-compose targets --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 733468d7e3..1e8fdb5e14 100644 --- a/Makefile +++ b/Makefile @@ -455,14 +455,14 @@ docker-compose-sources: .git/hooks/pre-commit -e minikube_container_group=$(MINIKUBE_CONTAINER_GROUP) -docker-compose: docker-auth awx/projects docker-compose-sources +docker-compose: awx/projects docker-compose-sources docker-compose -f tools/docker-compose/_sources/docker-compose.yml $(COMPOSE_OPTS) up $(COMPOSE_UP_OPTS) --remove-orphans -docker-compose-credential-plugins: docker-auth awx/projects docker-compose-sources +docker-compose-credential-plugins: 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" docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-credential-plugins-override.yml up --no-recreate awx_1 --remove-orphans -docker-compose-test: docker-auth awx/projects docker-compose-sources +docker-compose-test: awx/projects docker-compose-sources docker-compose -f tools/docker-compose/_sources/docker-compose.yml run --rm --service-ports awx_1 /bin/bash docker-compose-runtest: awx/projects docker-compose-sources @@ -504,10 +504,10 @@ docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean docker-refresh: docker-clean docker-compose # Docker Development Environment with Elastic Stack Connected -docker-compose-elk: docker-auth awx/projects docker-compose-sources +docker-compose-elk: awx/projects docker-compose-sources docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate -docker-compose-cluster-elk: docker-auth awx/projects docker-compose-sources +docker-compose-cluster-elk: awx/projects docker-compose-sources docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate prometheus: