Merge "Fix docker version check after docker-py>=6.0.0"

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."