diff options
| author | Zuul <zuul@review.opendev.org> | 2024-12-30 12:11:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-12-30 12:11:00 +0000 |
| commit | e3a33aae3abf66df4f31ef2c35b9597d051babc0 (patch) | |
| tree | 7a038a123e339ac572e8038a6e129e6c826b7825 /docker | |
| parent | 3cb7bea93be35bef0f4a93cc874cbc422d4fe084 (diff) | |
| parent | 7ae781561354afab79c83028f01beed16164971c (diff) | |
| download | kolla-e3a33aae3abf66df4f31ef2c35b9597d051babc0.tar.gz kolla-e3a33aae3abf66df4f31ef2c35b9597d051babc0.zip | |
Merge "Remove setuptools pin"
Diffstat (limited to 'docker')
| -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 9b04ea89b..af6492377 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -211,7 +211,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' %} |