From 1369c7f446051dd42b797bb0869465f749e9dea4 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Wed, 13 Dec 2023 10:46:32 +0100 Subject: Pin docker.py to <7 Docker 7.0.0 introduced a pre build check for tag regex, which fails where registry has port number defined - see [1] and [2]. [1]: https://github.com/docker/docker-py/commit/a9b5494fd0574e520c735e1d0c4a303528d48063 [2]: https://github.com/docker/docker-py/issues/3195 Also removing requirements check in CI as it is not allowing such pinning, as kolla is not designed to be installed with other openstack services in the same virtualenv. Change-Id: Id64186bf87300f23acde4f90474abcd6944e5be0 (cherry picked from commit acf23fa830c8909b366f3ea38279560136f8dff1) --- .zuul.d/project.yaml | 1 - requirements.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index eea317608..8fc44154e 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -3,7 +3,6 @@ templates: - openstack-python3-zed-jobs - openstack-python3-zed-jobs-arm64 - - check-requirements - publish-openstack-docs-pti - release-notes-jobs-python3 - periodic-stable-jobs diff --git a/requirements.txt b/requirements.txt index e949f8f5a..6a56bcb1e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 -docker>=3.0.0 # Apache-2.0 +docker>=3.0.0,<7.0.0 # Apache-2.0 Jinja2>=3.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) oslo.config>=5.1.0 # Apache-2.0 -- cgit v1.2.3