aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base
diff options
context:
space:
mode:
Diffstat (limited to 'docker/openstack-base')
-rw-r--r--docker/openstack-base/Dockerfile.j27
1 files changed, 0 insertions, 7 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index de111a94a..d81e49006 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -105,20 +105,13 @@ RUN apt-get install -y --no-install-recommends \
{% endif %}
ADD openstack-base-archive /openstack-base-source
-# TODO(jeffrey4l): Pin the pip to the 7.1.2. version. latest pip
-# (now 8.0) can not install the package when conflict with the
-# system. The best solution should use the virtualenv for
-# isolation or following bug is fixed:
-# https://github.com/pypa/pip/pull/3389
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 install pip==7.1.2 \
&& 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 pip==7.1.2 \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
jinja2 \
kazoo \