From ef83ff13fed6c4fb99a3f0445314fa08fa6fd932 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 8 Mar 2019 12:03:15 +0100 Subject: Introduce 'get_pip' macro We have code for it in four places so it is a good candidate for macro. Change-Id: Icadcbbe5b386bdf688fd67e8160b40974f047377 --- docker/kolla-toolbox/Dockerfile.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/kolla-toolbox') 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 = [ -- cgit v1.2.3