External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 18:51:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10915 from rooftopcellist/fix-make-target

Browse Source 
Add new COMPOSE_UP_PRE_OPTS variable to docker-compose up target
This commit is contained in:
Shane McDonald
2021-08-19 13:04:23 -04:00
committed by GitHub
parent 86390152bc a76194c493
commit b7c0f02cb1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -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"