diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-12 08:46:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-12 08:46:15 +0000 |
| commit | c2804ca14f47702bc4a26e624ee91028b9ae8662 (patch) | |
| tree | 8d2e2ef9b53f375a2331d44445108634a6545cf2 /docker/openstack-base | |
| parent | 1545fa6944605bf7783b36bd44b9eefd155c5f4c (diff) | |
| parent | ef83ff13fed6c4fb99a3f0445314fa08fa6fd932 (diff) | |
| download | kolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.tar.gz kolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.zip | |
Merge "Introduce 'get_pip' macro"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index d9d9306b1..c3dab166a 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -184,9 +184,7 @@ 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 +{{ macros.get_pip() }} {% endblock %} {% set openstack_base_pip_packages = [ |