From 0a6df40066b8c194a11d83fd69287965ded5e9dc Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 6 Apr 2016 12:24:19 -0400 Subject: [PATCH] Improvements to docker compose workflow with new packaging changes --- Makefile | 7 +------ requirements/requirements.txt | 2 +- requirements/requirements_dev.txt | 1 + tools/docker-compose/Dockerfile | 6 +++--- tools/docker-compose/start_development.sh | 13 ++++++------- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 2a36c87c61..33dda1c2b1 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7277d5f5e7..7439d7f349 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -21,7 +21,7 @@ django-auth-ldap==1.2.6 django-celery==3.1.17 django-crum==0.6.1 django-extensions==1.5.9 -git+https://github.com/chrismeyersfsu/django-jsonbfield@fix-sqlite_serialization#egg=django-jsonbfield +git+https://github.com/chrismeyersfsu/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield django-polymorphic==0.7.2 django-radius==1.0.0 djangorestframework==3.3.2 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index c6583f2ae8..214bbe601b 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -9,3 +9,4 @@ pytest-cov pytest-django pytest-pythonpath pytest-mock +django-split-settings diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 50276b6f9b..c0f834aebc 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -18,12 +18,12 @@ RUN mkdir -p /data/db ADD license /etc/awx/license ADD license /etc/tower/license RUN pip2 install honcho -RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.0/dumb-init_1.0.0_amd64.deb +RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.0.1/dumb-init_1.0.1_amd64.deb RUN dpkg -i dumb-init_*.deb -ADD start_development.sh /start_development.sh -ADD ansible-tower.egg-link /usr/local/lib/python2.7/dist-packages/ansible-tower.egg-link +ADD ansible-tower.egg-link /tmp/ansible-tower.egg-link ADD tower-manage /usr/local/bin/tower-manage ADD ansible_tower.egg-info /tmp/ansible_tower.egg-info +RUN ln -s /tower_devel/tools/docker-compose/start_development.sh /start_development.sh EXPOSE 8013 8080 22 ENTRYPOINT ["/usr/bin/dumb-init"] diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index 7f4684c928..16d859a3ce 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -22,14 +22,13 @@ fi cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true # Check if we need to build dependencies -if [ -f "awx/lib/.deps_built" ]; then - echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild" -else - make requirements_dev - touch awx/lib/.deps_built -fi +#if [ -f "awx/lib/.deps_built" ]; then +# echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild" +#else +make requirements_dev +# touch awx/lib/.deps_built +#fi -rm -rf /tower_devel/venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link cp /tmp/ansible-tower.egg-link /tower_devel/venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link # Tower bootstrapping