Merge pull request #10481 from brigzzy/compose_up_fix

Reorder docker compose up options
This commit is contained in:
Shane McDonald
2021-07-22 15:57:39 -04:00
committed by GitHub

View File

@@ -486,7 +486,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 $(COMPOSE_UP_OPTS) up
docker-compose -f tools/docker-compose/_sources/docker-compose.yml 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"