diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-08 12:03:15 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-03-11 16:52:09 +0100 |
| commit | ef83ff13fed6c4fb99a3f0445314fa08fa6fd932 (patch) | |
| tree | 55cfeb74d6e159c311e0fc09a7f7282660deac74 /docker/kolla-toolbox | |
| parent | fc8b5fa89df77f2f9f1f3a66849d3fbadd7f2299 (diff) | |
| download | kolla-ef83ff13fed6c4fb99a3f0445314fa08fa6fd932.tar.gz kolla-ef83ff13fed6c4fb99a3f0445314fa08fa6fd932.zip | |
Introduce 'get_pip' macro
We have code for it in four places so it is a good candidate for macro.
Change-Id: Icadcbbe5b386bdf688fd67e8160b40974f047377
Diffstat (limited to 'docker/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 |
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 = [ |