External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 02:17:37 -02: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 \ if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \ . $(VENV_BASE)/tower/bin/activate; \
fi; \ fi; \
if [ "$(VIRTUAL_ENV)" ]; then \ tower-manage register_instance --primary --hostname=127.0.0.1; \
tower-manage register_instance --primary --hostname=127.0.0.1; \
else \
sudo tower-manage register_instance --primary --hostname=127.0.0.1; \
fi
# Refresh development environment after pulling new code. # Refresh development environment after pulling new code.
refresh: clean requirements_dev version_file develop migrate refresh: clean requirements_dev version_file develop migrate
@@ -863,7 +859,6 @@ docker-compose-test:
MACHINE?=default MACHINE?=default
docker-clean: docker-clean:
rm -f awx/lib/.deps_built rm -f awx/lib/.deps_built
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)

2
requirements/requirements.txt
View File

@@ -21,7 +21,7 @@ django-auth-ldap==1.2.6
django-celery==3.1.17 django-celery==3.1.17
django-crum==0.6.1 django-crum==0.6.1
django-extensions==1.5.9 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-polymorphic==0.7.2
django-radius==1.0.0 django-radius==1.0.0
djangorestframework==3.3.2 djangorestframework==3.3.2

1
requirements/requirements_dev.txt
View File

@@ -9,3 +9,4 @@ pytest-cov
pytest-django pytest-django
pytest-pythonpath pytest-pythonpath
pytest-mock pytest-mock
django-split-settings

6
tools/docker-compose/Dockerfile
View File

@@ -18,12 +18,12 @@ RUN mkdir -p /data/db
ADD license /etc/awx/license ADD license /etc/awx/license
ADD license /etc/tower/license ADD license /etc/tower/license
RUN pip2 install honcho 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 RUN dpkg -i dumb-init_*.deb
ADD start_development.sh /start_development.sh ADD ansible-tower.egg-link /tmp/ansible-tower.egg-link
ADD ansible-tower.egg-link /usr/local/lib/python2.7/dist-packages/ansible-tower.egg-link
ADD tower-manage /usr/local/bin/tower-manage ADD tower-manage /usr/local/bin/tower-manage
ADD ansible_tower.egg-info /tmp/ansible_tower.egg-info 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 EXPOSE 8013 8080 22
ENTRYPOINT ["/usr/bin/dumb-init"] ENTRYPOINT ["/usr/bin/dumb-init"]

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

@@ -22,14 +22,13 @@ fi
cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
# 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
echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild" # echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild"
else #else
make requirements_dev make requirements_dev
touch awx/lib/.deps_built # touch awx/lib/.deps_built
fi #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 cp /tmp/ansible-tower.egg-link /tower_devel/venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link
# Tower bootstrapping # Tower bootstrapping