diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-11-24 12:35:54 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-12-11 12:14:33 +0000 |
| commit | 7ae781561354afab79c83028f01beed16164971c (patch) | |
| tree | 5bd48e1ac6a1d0e59fbbb5e93f608e3cf4fcf029 | |
| parent | da7562c73fb4139a6a32a2137850e371782a1390 (diff) | |
| download | kolla-7ae781561354afab79c83028f01beed16164971c.tar.gz kolla-7ae781561354afab79c83028f01beed16164971c.zip | |
Remove setuptools pin
Change-Id: I7d08ebb65e2de82e3edba7bd9307b2b6ac8cb7a8
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index f12676be4..d73e5702d 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -49,7 +49,9 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start # NOTE(kevko): This dance with local settings python paths below is needed # because we are using different distros with different python version and we need to # know to which path symlink should point to. +# NOTE(mnasiadka): pinning setuptools due to https://bugs.launchpad.net/horizon/+bug/2007574 RUN ln -s horizon-source/* horizon \ + && {{ macros.install_pip(['setuptools==67.2.*']) }} \ && {{ macros.upper_constraints_remove("horizon") }} \ && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/openstack-dashboard \ diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 46af0aecd..96e504abb 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -208,7 +208,7 @@ RUN ln -s openstack-base-source/* /requirements \ ENV PATH /var/lib/kolla/venv/bin:$PATH -RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools==67.2.*']) }} \ +RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ && {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packages")) }} {% if base_package_type == 'rpm' %} |