openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "Pin the pip version to 7.1.2""

Browse Source
This commit is contained in:
Jenkins 2016-01-25 16:14:39 +00:00 committed by Gerrit Code Review
commit 436257ea84
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/kolla-ansible/Dockerfile.j2
View File

@ -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 \

7
docker/openstack-base/Dockerfile.j2
View File

@ -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 \