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 | |
| parent | 1545fa6944605bf7783b36bd44b9eefd155c5f4c (diff) | |
| parent | ef83ff13fed6c4fb99a3f0445314fa08fa6fd932 (diff) | |
| download | kolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.tar.gz kolla-c2804ca14f47702bc4a26e624ee91028b9ae8662.zip | |
Merge "Introduce 'get_pip' macro"
| -rw-r--r-- | docker/crane/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/helm-repository/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/macros.j2 | 6 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | releasenotes/notes/get_pip-macro-906a78462b216049.yaml | 4 |
6 files changed, 14 insertions, 12 deletions
diff --git a/docker/crane/Dockerfile.j2 b/docker/crane/Dockerfile.j2 index aea3f301f..dfb8fe9eb 100644 --- a/docker/crane/Dockerfile.j2 +++ b/docker/crane/Dockerfile.j2 @@ -45,9 +45,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false {% endif %} {% block crane_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 %} ADD crane-archive /crane-source diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2 index dc20229b8..3734e2856 100644 --- a/docker/helm-repository/Dockerfile.j2 +++ b/docker/helm-repository/Dockerfile.j2 @@ -35,9 +35,7 @@ ENV helm_version=2.3.0 \ {{ macros.install_packages(helm_repo_packages | customizable("packages")) }} {% block helm_repository_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 helm_repository_pip_packages = [ 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 = [ diff --git a/docker/macros.j2 b/docker/macros.j2 index 5386dca75..aee933e7b 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -21,6 +21,12 @@ {% endif %} {%- endmacro %} +{% macro get_pip() %} +RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ + && python get-pip.py \ + && rm get-pip.py +{% endmacro %} + {% macro install_pip(packages, constraints = true, pip_version = pip) %} {%- if packages is sequence and packages|length > 0 -%} {%- if not pip_version -%} 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 = [ diff --git a/releasenotes/notes/get_pip-macro-906a78462b216049.yaml b/releasenotes/notes/get_pip-macro-906a78462b216049.yaml new file mode 100644 index 000000000..f4ed0d92b --- /dev/null +++ b/releasenotes/notes/get_pip-macro-906a78462b216049.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + New macro: 'get_pip' allows to bootstrap 'pip' in image. |