aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base/Dockerfile.j2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-29 02:44:03 +0000
committerGerrit Code Review <review@openstack.org>2015-12-29 02:44:03 +0000
commit83545d4f0d7b9917d98591933088291bfd06f9d6 (patch)
tree30ef49530257510a505074cefd813e2339985757 /docker/openstack-base/Dockerfile.j2
parentbeb8b7ddc4cf6cb4fd2425ded19531cb2304b42b (diff)
parentcda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 (diff)
downloadkolla-83545d4f0d7b9917d98591933088291bfd06f9d6.tar.gz
kolla-83545d4f0d7b9917d98591933088291bfd06f9d6.zip
Merge "Fix pip install settings"
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
-rw-r--r--docker/openstack-base/Dockerfile.j26
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 7d87a4bd2..964b8b67c 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -79,9 +79,9 @@ RUN ln -s openstack-base-source/* /requirements \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \
- && 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 \
+ && pip --no-cache-dir install -U virtualenv \
+ && virtualenv --system-site-packages /var/lib/kolla/venv \
+ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
jinja2 \
kazoo \
python-barbicanclient \