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

Improvements to docker compose workflow with new packaging changes

Browse Source
This commit is contained in:
Matthew Jones
2016-04-06 12:24:19 -04:00
parent ae9222f716
commit 0a6df40066
5 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -305,11 +305,7 @@ init:
if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
if [ "$(VIRTUAL_ENV)" ]; then \
tower-manage register_instance --primary --hostname=127.0.0.1; \
else \
sudo tower-manage register_instance --primary --hostname=127.0.0.1; \
fi
tower-manage register_instance --primary --hostname=127.0.0.1; \
# Refresh development environment after pulling new code.
refresh: clean requirements_dev version_file develop migrate
@@ -863,7 +859,6 @@ docker-compose-test:
MACHINE?=default
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)