From febcb600f122dc644f8a05c4a7697a39e9157834 Mon Sep 17 00:00:00 2001 From: Michal Rostecki Date: Wed, 18 Nov 2015 07:22:17 +0100 Subject: Source installation in virtualenv Use virtualenv for installation of OpenStack projects and dependencies to avoid conflicts with Python libraries installed by non-OpenStack binary packages. Change-Id: I21ecd673b2e93335b1d3dd4e279e940c9d694c3c Implements: blueprint virtualenv --- docker/horizon/Dockerfile.j2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docker/horizon') diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index b8e483f41..f9e5a7fab 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -43,16 +43,16 @@ RUN apt-get install -y --no-install-recommends \ ADD horizon-archive /horizon-source RUN ln -s horizon-source/* horizon \ - && pip --no-cache-dir install -c requirements/upper-constraints.txt /horizon \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /horizon \ && useradd --user-group horizon \ && mkdir -p /etc/openstack-dashboard /home/horizon \ - && ln -s /etc/openstack-dashboard/local_settings /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ + && ln -s /etc/openstack-dashboard/local_settings /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \ - && cp /horizon/manage.py /usr/bin/manage.py \ - && /usr/bin/python /usr/bin/manage.py collectstatic --noinput --clear \ - && /usr/bin/python /usr/bin/manage.py compress --force \ - && chown -R horizon: /etc/openstack-dashboard /home/horizon /usr/lib/python2.7/site-packages/static + && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ + && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear \ + && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force \ + && chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/kolla/venv/lib/python2.7/site-packages/static {% endif %} -- cgit v1.2.3