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

Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6

Browse Source 
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
This commit is contained in:
Graham Mainwaring
2016-03-21 12:13:50 -04:00
parent 1427fee442 edabf23c6a
commit 1e8e53e811
138 changed files with 4454 additions and 158607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -870,13 +870,15 @@ docker-compose-test:
cd tools && docker-compose run --rm --service-ports tower /bin/bash
MACHINE?=default
docker-refresh:
docker-clean:
rm -f awx/lib/.deps_built
rm -rf awx/lib/site-packages
eval $$(docker-machine env $(MACHINE))
docker stop $$(docker ps -a -q)
docker rm $$(docker ps -f name=tools_tower -a -q)
docker rmi tools_tower
docker-compose -f tools/docker-compose.yml up
-docker rm $$(docker ps -f name=tools_tower -a -q)
-docker rmi tools_tower
docker-refresh: docker-clean docker-compose
mongo-debug-ui:
docker run -it --rm --name mongo-express --link tools_mongo_1:mongo -e ME_CONFIG_OPTIONS_EDITORTHEME=ambiance -e ME_CONFIG_BASICAUTH_USERNAME=admin -e ME_CONFIG_BASICAUTH_PASSWORD=password -p 8081:8081 knickers/mongo-express