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

Merge pull request #1272 from AlanCoding/container_tower_package

Browse Source 
Tweaks to help development container workflow
This commit is contained in:
Alan Rominger
2016-03-18 08:17:54 -04:00
parent 9f61cefe0b a0ce6d7a25
commit 8b610d132d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -804,7 +804,7 @@ docker-compose-test:
MACHINE?=default MACHINE?=default
docker-clean: docker-clean:
rm -f awx/lib/.deps_built rm -f awx/lib/.deps_built
rm -f awx/lib/site-packages rm -rf awx/lib/site-packages
eval $$(docker-machine env $(MACHINE)) eval $$(docker-machine env $(MACHINE))
docker stop $$(docker ps -a -q) docker stop $$(docker ps -a -q)
-docker rm $$(docker ps -f name=tools_tower -a -q) -docker rm $$(docker ps -f name=tools_tower -a -q)

3
tools/docker-compose/start_development.sh
View File

@@ -20,8 +20,7 @@ else
echo "Failed to find tower source tree, map your development tree volume" echo "Failed to find tower source tree, map your development tree volume"
fi fi
rm -rf /tower_devel/ansible_tower.egg-info cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
mv /tmp/ansible_tower.egg-info /tower_devel/
# Check if we need to build dependencies # Check if we need to build dependencies
if [ -f "awx/lib/.deps_built" ]; then if [ -f "awx/lib/.deps_built" ]; then