Merge pull request #2239 from boushley/devel

Fix issue with comparing versions improperly
9 years ago · a876704740
parent 0250ea1507 81e9d1bde5
commit a876704740
1 changed files with 2 additions and 2 deletions
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@ -1099,7 +1099,7 @@ class DockerManager(object):
                self.module.fail_json(msg=str(e))

            #For v1.19 API and above use HostConfig, otherwise use Config
-            if api_version >= 1.19:
+            if docker.utils.compare_version('1.19', api_version) >= 0:
                actual_mem = container['HostConfig']['Memory']
            else:
                actual_mem = container['Config']['Memory']
@ -1440,7 +1440,7 @@ class DockerManager(object):
            params['host_config'] = self.create_host_config()

        #For v1.19 API and above use HostConfig, otherwise use Config
-        if api_version < 1.19:
+        if docker.utils.compare_version('1.19', api_version) < 0:
            params['mem_limit'] = mem_limit
        else:
            params['host_config']['Memory'] = mem_limit