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

Merge pull request #6248 from mabashian/makefile-fix

Browse Source 
Fixed make docker-compose-test
This commit is contained in:
Michael Abashian
2017-05-11 21:21:12 -04:00
committed by GitHub
parent 7a1c6c6794 070de2fe67
commit c04ac86df8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -938,7 +938,7 @@ docker-compose-cluster: docker-auth
DOCKER_HOST_IP=$(DOCKER_HOST_IP) TAG=$(COMPOSE_TAG) docker-compose -f tools/docker-compose-cluster.yml up DOCKER_HOST_IP=$(DOCKER_HOST_IP) TAG=$(COMPOSE_TAG) docker-compose -f tools/docker-compose-cluster.yml up
docker-compose-test: docker-auth docker-compose-test: docker-auth
cd tools && TAG=$(COMPOSE_TAG) docker-compose run --rm --service-ports tower /bin/bash cd tools && DOCKER_HOST_IP=$(DOCKER_HOST_IP) TAG=$(COMPOSE_TAG) docker-compose run --rm --service-ports tower /bin/bash
docker-compose-build: docker-compose-build:
docker build -t ansible/tower_devel -f tools/docker-compose/Dockerfile . docker build -t ansible/tower_devel -f tools/docker-compose/Dockerfile .