mem_limit client version check

1 files changed, 8 insertions, 2 deletions

diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index d54259cd..f6aba9ab 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -1258,12 +1258,12 @@ class DockerManager(object):
             mem_limit = _human_to_bytes(self.module.params.get('memory_limit'))
         except ValueError as e:
             self.module.fail_json(msg=str(e))
+        api_version = self.client.version()['ApiVersion']
 
         params = {'image':        self.module.params.get('image'),
                   'command':      self.module.params.get('command'),
                   'ports':        self.exposed_ports,
                   'volumes':      self.volumes,
-                  'mem_limit':    mem_limit,
                   'environment':  self.env,
                   'hostname':     self.module.params.get('hostname'),
                   'domainname':   self.module.params.get('domainname'),
@@ -1272,10 +1272,16 @@ class DockerManager(object):
                   'stdin_open':   self.module.params.get('stdin_open'),
                   'tty':          self.module.params.get('tty'),
                   }
-
         if self.ensure_capability('host_config', fail=False):
             params['host_config'] = self.get_host_config()
 
+        #For v1.19 API and above use HostConfig, otherwise use Config
+        if api_version < 1.19:
+            params['mem_limit'] = mem_limit
+        else:
+            params['host_config']['mem_limit'] = mem_limit
+
+
         def do_create(count, params):
             results = []
             for _ in range(count):