diff options
| author | Matthew Jones <mat@matburt.net> | 2016-03-09 20:33:42 +0100 |
|---|---|---|
| committer | Graham Mainwaring <gmainwaring@ansible.com> | 2016-03-21 17:11:19 +0100 |
| commit | 46bbc83d0df05d6e1dcb739e719750735d9625c0 (patch) | |
| tree | 21f3b90486d0f89fe46141303e2f57adc31b8b29 /tools | |
| parent | flake8 fix (diff) | |
| download | awx-46bbc83d0df05d6e1dcb739e719750735d9625c0.tar.xz awx-46bbc83d0df05d6e1dcb739e719750735d9625c0.zip | |
Changes for Tower virtualenv support
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/Dockerfile | 4 | ||||
| -rwxr-xr-x | tools/docker-compose/start_development.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 72568d3dfc..91c156e1ef 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -11,9 +11,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && apt RUN echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list && echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | tee /etc/apt/sources.list.d/postgres-9.4.list RUN apt-get update RUN apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-psycopg2 make postgresql-client libpq-dev nodejs python-psutil libxml2-dev libxslt-dev lib32z1-dev libsasl2-dev libldap2-dev libffi-dev libzmq-dev proot python-pip libxmlsec1-dev swig redis-server && rm -rf /var/lib/apt/lists/* -RUN pip install flake8 -RUN pip install pytest pytest-pythonpath pytest-django pytest-cov -RUN pip install dateutils # for private/license_writer.py +RUN pip install flake8 pytest pytest-pythonpath pytest-django pytest-cov pytest-mock dateutils django-debug-toolbar==1.4 pyflakes==1.0.0 virtualenv RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /etc/tower RUN mkdir -p /data/db diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh index bfbf7cc17d..a8ae080a2b 100755 --- a/tools/docker-compose/start_development.sh +++ b/tools/docker-compose/start_development.sh @@ -21,7 +21,7 @@ else fi rm -rf /tower_devel/ansible_tower.egg-info -mv /tmp/ansible_tower.egg-info /tower_devel/ +cp -R /tmp/ansible_tower.egg-info /tower_devel/ # Check if we need to build dependencies if [ -f "awx/lib/.deps_built" ]; then @@ -31,6 +31,9 @@ else 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 make version_file make migrate |