diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-01-25 13:08:45 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-01-25 13:21:35 +0000 |
| commit | d13c41b776b092a5fd4934962032d354c1822539 (patch) | |
| tree | 47eeb0328b2f2d0c2ac19f80b9877f6e7e5d3c57 | |
| parent | d7dde0265383e2498cfec9420b1a35d1f754b47f (diff) | |
| download | kolla-d13c41b776b092a5fd4934962032d354c1822539.tar.gz kolla-d13c41b776b092a5fd4934962032d354c1822539.zip | |
Upgrade pip and friends in source images (part 2)
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.
This change covers entries missed in I4ae3a82cc796a60450c2a35beba32972964bc5d0
Change-Id: I0d69009b8b736b59b122ad29a9a5f6a22b041513
| -rw-r--r-- | docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 index 68d2759fe..7106d87cf 100644 --- a/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 +++ b/docker/elasticsearch/elasticsearch-curator/Dockerfile.j2 @@ -30,7 +30,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'elasticsearch-curator' ] %} -RUN {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \ +RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} \ + && {{ macros.install_pip(elasticsearch_curator_pip_packages | customizable("pip_packages"), constraints=false) }} \ && mkdir -p /etc/elasticsearch-curator \ && chown -R elasticsearch: /etc/elasticsearch-curator diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 index 5c42abb6a..9981b5997 100644 --- a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 @@ -19,7 +19,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} -RUN {{ macros.install_pip(openvswitch_netcontrold_pip_packages | customizable("pip_packages"), constraints = false) }} +RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools'], constraints=false) }} \ + && {{ macros.install_pip(openvswitch_netcontrold_pip_packages | customizable("pip_packages"), constraints = false) }} {% endblock %} |