aboutsummaryrefslogtreecommitdiff
path: root/docker/openstack-base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-12-07 14:07:18 +0000
committerGerrit Code Review <review@openstack.org>2021-12-07 14:07:18 +0000
commitf44d6ce85a56d2f77896f32901ebc73113fcc51f (patch)
tree4dfcdba0ba2c79afea70aa39c0f7abd9eac8f136 /docker/openstack-base/Dockerfile.j2
parent0443cee2232bb7cf82e7cc68364b78c71810503c (diff)
parenta41001f7143a1a60f0334f20206481335b14141a (diff)
downloadkolla-f44d6ce85a56d2f77896f32901ebc73113fcc51f.tar.gz
kolla-f44d6ce85a56d2f77896f32901ebc73113fcc51f.zip
Merge "Upgrade pip and friends in source images"
Diffstat (limited to 'docker/openstack-base/Dockerfile.j2')
-rw-r--r--docker/openstack-base/Dockerfile.j23
1 files changed, 2 insertions, 1 deletions
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 %}