From 050e26ed89b307a2037f118e314d0a44249a0f89 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 4 May 2023 18:55:52 +0200 Subject: Fix docker version check after docker-py>=6.0.0 docker-py reworked their version function and now it does not return a string [1]. Example: >>> import docker >>> docker.version [1]: https://github.com/docker/docker-py/commit/cd2c35a9b699522b282cc4f024efa5699df24896 Closes-Bug: #2018559 Change-Id: I5ec0fbfdaf18cf53a6b5bf91236d3e040daa9d7e --- kolla/engine_adapter/engine.py | 2 +- kolla/image/build.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kolla/engine_adapter/engine.py b/kolla/engine_adapter/engine.py index 184bb3856..dc608204c 100644 --- a/kolla/engine_adapter/engine.py +++ b/kolla/engine_adapter/engine.py @@ -52,6 +52,6 @@ def getEngineClient(conf): def getEngineVersion(conf): if conf.engine == Engine.DOCKER.value: - return StrictVersion(docker.version) + return StrictVersion(docker.__version__) else: raise UnsupportedEngineError(conf.engine) diff --git a/kolla/image/build.py b/kolla/image/build.py index fdf1635c8..2c0388416 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -19,6 +19,7 @@ import sys import threading import time +from distutils.version import StrictVersion from kolla.common import config as common_config from kolla.common import utils from kolla.engine_adapter import engine @@ -113,7 +114,7 @@ def run_build(): if conf.engine == engine.Engine.DOCKER.value: try: import docker - docker.version + StrictVersion(docker.__version__) except ImportError: LOG.error("Error, you have set Docker as container engine, " "but the Python library is not found." -- cgit v1.2.3