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

Merge branch 'devel' of https://github.com/ansible/ansible-tower into jtabor-sockets

Browse Source
This commit is contained in:
Wayne Witzel III
2016-10-06 10:06:30 -04:00
parent 71c84a6383 4b57263adf
commit 9049fb208f
33 changed files with 1130 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -770,7 +770,7 @@ MACHINE?=default
docker-clean:
eval $$(docker-machine env $(MACHINE))
$(foreach container_id,$(shell docker ps -f name=tools_tower -aq),docker stop $(container_id); docker rm -f $(container_id);)
-docker images | grep "tower_devel" | awk '{print $3}' | xargs docker rmi
-docker images | grep "tower_devel" | awk '{print $$3}' | xargs docker rmi
docker-refresh: docker-clean docker-compose