diff options
| author | Alan Rominger <alan.rominger@gmail.com> | 2016-03-18 13:17:54 +0100 |
|---|---|---|
| committer | Alan Rominger <alan.rominger@gmail.com> | 2016-03-18 13:17:54 +0100 |
| commit | 8b610d132d41d2d0f4e6729f6c9b4fbabb6f2539 (patch) | |
| tree | 6b410388ed4d115e204bb8ba0575802b118b2687 | |
| parent | Merge pull request #1205 from chrismeyersfsu/mongoectomy_playbook (diff) | |
| parent | fix regression of development package naming (diff) | |
| download | awx-8b610d132d41d2d0f4e6729f6c9b4fbabb6f2539.tar.xz awx-8b610d132d41d2d0f4e6729f6c9b4fbabb6f2539.zip | |
Merge pull request #1272 from AlanCoding/container_tower_package
Tweaks to help development container workflow
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | tools/docker-compose/start_development.sh | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -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) diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index bfbf7cc17d..4368f41779 100755 --- a/tools/docker-compose/start_development.sh +++ b/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 |