Merge pull request #1272 from AlanCoding/container_tower_package

Tweaks to help development container workflow

Makefile

@@ -804,7 +804,7 @@ docker-compose-test:
 MACHINE?=default
 docker-clean:
 	rm -f awx/lib/.deps_built
-	rm -f awx/lib/site-packages
+	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)

tools/docker-compose/start_development.sh

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