diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-31 17:50:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-31 17:50:12 +0000 |
| commit | b4c505a6c8da19be438cbf03e28a4d3f82099a11 (patch) | |
| tree | 175f6da77b3eeafd6d9da44cbee04c0c1a62e7b0 | |
| parent | dd0988f074a44c59e379f91fa38d6932e8e4651d (diff) | |
| parent | 7bba25a16095cbee5631b7f9c8cc6259e4d213c6 (diff) | |
| download | kolla-b4c505a6c8da19be438cbf03e28a4d3f82099a11.tar.gz kolla-b4c505a6c8da19be438cbf03e28a4d3f82099a11.zip | |
Merge "Allow operators to override use of get-pip.py"
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 99544749a..3ec33f1be 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -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 \ |