Skip to content
Snippets Groups Projects
Commit b18f47c7 authored by Allen Gao's avatar Allen Gao
Browse files

Revert "Pin the pip version to 7.1.2"

This reverts commit 14dfbc13.
This issue has already been fixed after pip 8.0.1 released.

TrivialFix

Change-Id: Ie559286beac56aa5ac35addd647c1d342ba6562b
parent 5c706125
No related branches found
No related tags found
No related merge requests found
...@@ -33,15 +33,9 @@ RUN apt-get -y --no-install-recommends install \ ...@@ -33,15 +33,9 @@ RUN apt-get -y --no-install-recommends install \
{% endif %} {% endif %}
# 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 curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \ && python get-pip.py \
&& rm get-pip.py \ && rm get-pip.py \
&& pip install pip==7.1.2 \
&& pip --no-cache-dir install --upgrade wheel \ && pip --no-cache-dir install --upgrade wheel \
&& pip --no-cache-dir install \ && pip --no-cache-dir install \
MySQL-python \ MySQL-python \
......
...@@ -105,20 +105,13 @@ RUN apt-get install -y --no-install-recommends \ ...@@ -105,20 +105,13 @@ RUN apt-get install -y --no-install-recommends \
{% endif %} {% endif %}
ADD openstack-base-archive /openstack-base-source 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 \ RUN ln -s openstack-base-source/* /requirements \
&& mkdir /var/lib/kolla \ && mkdir /var/lib/kolla \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \ && python get-pip.py \
&& rm get-pip.py \ && rm get-pip.py \
&& pip install pip==7.1.2 \
&& pip --no-cache-dir install -U virtualenv \ && pip --no-cache-dir install -U virtualenv \
&& virtualenv --system-site-packages /var/lib/kolla/venv \ && 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 \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
jinja2 \ jinja2 \
kazoo \ kazoo \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment