Merge pull request #1920 from ilya-epifanov/devel

fixed memory_limit for docker api version >= 1.19
11 years ago · c6d09d8f8d
parent f925f7e01f d951172920
commit c6d09d8f8d
1 changed files with 1 additions and 1 deletions
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@ -1428,7 +1428,7 @@ class DockerManager(object):
        if api_version < 1.19:
            params['mem_limit'] = mem_limit
        else:
-            params['host_config']['mem_limit'] = mem_limit
+            params['host_config']['Memory'] = mem_limit


        def do_create(count, params):