From a41001f7143a1a60f0334f20206481335b14141a Mon Sep 17 00:00:00 2001 From: Radosław Piliszek Date: Wed, 13 Jan 2021 18:01:36 +0100 Subject: Upgrade pip and friends in source images New pip has nice features for detection of conflicting requirements. When installing from PyPI, as we do in source images, running the latest pip+setuptools+wheel is recommended. Co-authored-by: Marcin Juszkiewicz Change-Id: I4ae3a82cc796a60450c2a35beba32972964bc5d0 --- docker/openstack-base/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docker/openstack-base/Dockerfile.j2') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 94c507311..f46d1a5f3 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -328,7 +328,8 @@ RUN ln -s openstack-base-source/* /requirements \ ENV PATH /var/lib/kolla/venv/bin:$PATH -RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} +RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ + && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} {% endif %} -- cgit v1.2.3