diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-27 19:27:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-27 19:27:42 +0000 |
| commit | 61550cefac7c6cdc035b8f5f7becdab85035d957 (patch) | |
| tree | bd21a573a71691fbf264eb4419297a84218ee8e5 /docker/openstack-base | |
| parent | f294b5ce2918779e130c76a54252b21f8d32f6e7 (diff) | |
| parent | febcb600f122dc644f8a05c4a7697a39e9157834 (diff) | |
| download | kolla-61550cefac7c6cdc035b8f5f7becdab85035d957.tar.gz kolla-61550cefac7c6cdc035b8f5f7becdab85035d957.zip | |
Merge "Source installation in virtualenv"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 1db7eb011..900fc3b4d 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -74,10 +74,13 @@ RUN apt-get install -y --no-install-recommends \ ADD openstack-base-archive /openstack-base-source RUN ln -s openstack-base-source/* /requirements \ + && mkdir /var/lib/kolla \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ - && pip --no-cache-dir install -U -c requirements/upper-constraints.txt \ + && pip install -U virtualenv \ + && virtualenv /var/lib/kolla/venv \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -U -c requirements/upper-constraints.txt \ python-barbicanclient \ python-ceilometerclient \ python-congressclient \ @@ -96,5 +99,6 @@ RUN ln -s openstack-base-source/* /requirements \ python-openstackclient \ MySQL-python \ python-memcached +ENV PATH /var/lib/kolla/venv/bin:$PATH {% endif %} |