diff options
| author | Zuul <zuul@review.opendev.org> | 2026-06-19 11:04:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-06-19 11:04:04 +0000 |
| commit | 0f095af001d64dbb99834917628f765b0d672c07 (patch) | |
| tree | 3f14db0b64082b12a3846f30c73fb52f6d0c7054 /docker | |
| parent | 9da54ce8874c36a09cbb98081ca550908b980257 (diff) | |
| parent | c7e511f2f921efb9d60b04401fc4b72da55a7f99 (diff) | |
| download | kolla-0f095af001d64dbb99834917628f765b0d672c07.tar.gz kolla-0f095af001d64dbb99834917628f765b0d672c07.zip | |
Merge "Revert "horizon: pin setuptools <82""
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index bd661fcad..86a9f8058 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -46,13 +46,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(bbezak): pin setuptools for pip build isolation due to -# https://bugs.launchpad.net/horizon/+bug/2141293 RUN ln -s horizon-source/* horizon \ && {{ macros.upper_constraints_remove("horizon") }} \ - && echo "setuptools<82" > /tmp/horizon-build-constraints.txt \ - && PIP_BUILD_CONSTRAINT=/tmp/horizon-build-constraints.txt \ - {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ + && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/openstack-dashboard \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings.py \ |