openstack
/
kolla
Code Issues Proposed changes

Allow operators to override use of get-pip.py 

Operators may not want to run get-pip.py from an external source.

TrivialFix

Change-Id: I591b0cef135f9e1e3054c48c93a17b7b74fd0a9a
This commit is contained in:
Paul Bourke 2016-08-31 17:00:11 +01:00
parent 624d300dc4
commit 7bba25a160
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,12 +225,15 @@ ENV DEBIAN_FRONTEND noninteractive
{{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
{% block source_install_python_pip %}
RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py
{% endblock %}
ADD openstack-base-archive /openstack-base-source
RUN ln -s openstack-base-source/* /requirements \
&& mkdir -p /var/lib/kolla \
&& curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
&& python get-pip.py \
&& rm get-pip.py \
&& 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 --upgrade -c requirements/upper-constraints.txt \