aboutsummaryrefslogtreecommitdiff
path: root/docker/kolla-toolbox
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-03-12 08:46:15 +0000
committerGerrit Code Review <review@openstack.org>2019-03-12 08:46:15 +0000
commitc2804ca14f47702bc4a26e624ee91028b9ae8662 (patch)
tree8d2e2ef9b53f375a2331d44445108634a6545cf2 /docker/kolla-toolbox
parent1545fa6944605bf7783b36bd44b9eefd155c5f4c (diff)
parentef83ff13fed6c4fb99a3f0445314fa08fa6fd932 (diff)
downloadkolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.tar.gz
kolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.zip
Merge "Introduce 'get_pip' macro"
Diffstat (limited to 'docker/kolla-toolbox')
-rw-r--r--docker/kolla-toolbox/Dockerfile.j24
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 768ebd2dd..ca616074b 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -47,9 +47,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
{% block kolla_toolbox_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 kolla_toolbox_pip_virtualenv_packages = [