diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-25 16:14:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-25 16:14:39 +0000 |
| commit | 436257ea84326b65124d52018a3f36a99692c734 (patch) | |
| tree | d5af225e195ea087dfc3237b76a96baeafd845a6 | |
| parent | 94f5e870028ef8bf1336c805d6c9e69789fab432 (diff) | |
| parent | b18f47c7de57fd2863c0913ef9256f09083c5f8b (diff) | |
| download | kolla-436257ea84326b65124d52018a3f36a99692c734.tar.gz kolla-436257ea84326b65124d52018a3f36a99692c734.zip | |
Merge "Revert "Pin the pip version to 7.1.2""
| -rw-r--r-- | docker/kolla-ansible/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/docker/kolla-ansible/Dockerfile.j2 b/docker/kolla-ansible/Dockerfile.j2 index 5f67010fa..fe80db693 100644 --- a/docker/kolla-ansible/Dockerfile.j2 +++ b/docker/kolla-ansible/Dockerfile.j2 @@ -33,15 +33,9 @@ RUN apt-get -y --no-install-recommends install \ {% 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 \ && python 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 \ MySQL-python \ 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 \ |