diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-07 14:07:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-07 14:07:18 +0000 |
| commit | f44d6ce85a56d2f77896f32901ebc73113fcc51f (patch) | |
| tree | 4dfcdba0ba2c79afea70aa39c0f7abd9eac8f136 /docker | |
| parent | 0443cee2232bb7cf82e7cc68364b78c71810503c (diff) | |
| parent | a41001f7143a1a60f0334f20206481335b14141a (diff) | |
| download | kolla-f44d6ce85a56d2f77896f32901ebc73113fcc51f.tar.gz kolla-f44d6ce85a56d2f77896f32901ebc73113fcc51f.zip | |
Merge "Upgrade pip and friends in source images"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 01292c135..c09c40843 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -94,7 +94,8 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH ] %} COPY requirements.yml /var/lib/ansible/ -RUN {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ +RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ + && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ansible /usr/share/ansible \ && echo 'localhost ansible_connection=local ansible_python_interpreter={{ virtualenv_path }}/bin/python' > /etc/ansible/hosts \ && sed -i 's| "identity_api_version": "2.0",| "identity_api_version": "3",|' {{ os_client_config }} \ 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 %} |