diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-20 17:31:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-20 17:31:20 +0000 |
| commit | 048e6328221879dc7e9a7109b6ef012af193c04e (patch) | |
| tree | 4436a8961a94691914457fd8f0e80a1923e347e2 /docker/openstack-base | |
| parent | 10cfc7ba3a366381bbabdb2966577d4f9ff32dd6 (diff) | |
| parent | 14dfbc13a25b43850be15933ca79a7d701b91bac (diff) | |
| download | kolla-048e6328221879dc7e9a7109b6ef012af193c04e.tar.gz kolla-048e6328221879dc7e9a7109b6ef012af193c04e.zip | |
Merge "Pin the pip version to 7.1.2"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index d81e49006..de111a94a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -105,13 +105,20 @@ 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 \ |