cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1920 from ilya-epifanov/devel

Browse source 
fixed memory_limit for docker api version  >= 1.19
This commit is contained in:
Toshio Kuratomi 2015-08-20 09:03:54 -07:00
commit c6d09d8f8d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cloud/docker/docker.py
View file

@ -1428,7 +1428,7 @@ class DockerManager(object):
if api_version < 1.19: if api_version < 1.19:
params['mem_limit'] = mem_limit params['mem_limit'] = mem_limit
else: else:
params['host_config']['mem_limit'] = mem_limit params['host_config']['Memory'] = mem_limit
def do_create(count, params): def do_create(count, params):