From 76d78b50c0208795c4bc93b932e7fb0e79a036fc Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Tue, 23 Jan 2024 08:42:25 +0100 Subject: [PATCH] Fix gnocchi and skyline after requirements change Global-requirements changed upper-constraints in [1]. Because of that change skyline and gnocchi build is now failing. This patch fixes upper-constraints for those projects. [1] https://review.opendev.org/c/openstack/requirements/+/900435 Change-Id: I09cc2635cd422a859ccded887affb58dfbdc60ad --- docker/gnocchi/gnocchi-base/Dockerfile.j2 | 2 ++ docker/skyline/skyline-base/Dockerfile.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index e336af3f93..22b40b21db 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -41,6 +41,8 @@ ADD gnocchi-base-archive /gnocchi-base-source COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY gnocchi_sudoers /etc/sudoers.d/kolla_gnocchi_sudoers +RUN {{ macros.upper_constraints_version_change("Werkzeug", "3.0.1", "2.2.3") }} + RUN ln -s gnocchi-base-source/* gnocchi \ && {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/gnocchi \ diff --git a/docker/skyline/skyline-base/Dockerfile.j2 b/docker/skyline/skyline-base/Dockerfile.j2 index 23ae132235..9b7ee3f516 100644 --- a/docker/skyline/skyline-base/Dockerfile.j2 +++ b/docker/skyline/skyline-base/Dockerfile.j2 @@ -14,4 +14,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN touch /usr/local/bin/kolla_skyline_extend_start \ && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_skyline_extend_start +RUN {{ macros.upper_constraints_version_change("SQLAlchemy", "1.4.50", "1.4.41") }} + {% block skyline_base_footer %}{% endblock %}