saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #33748 from ticosax/adjust-api-version-host-config

Browse source 
HostConfig has been introduced by docker api version 1.15
This commit is contained in:
Mike Place 2016-06-03 08:28:40 -07:00
commit c2b970789c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/dockerng.py
View file

@ -2943,9 +2943,9 @@ def create(image,
if 'api_name' in val:
create_kwargs[val['api_name']] = create_kwargs.pop(key)
# Added to manage api change in 1.19.
# mem_limit and memswap_limit must be provided in host_config object
if salt.utils.version_cmp(version()['ApiVersion'], '1.18') == 1:
# API v1.15 introduced HostConfig parameter
# https://docs.docker.com/engine/reference/api/docker_remote_api_v1.15/#create-a-container
if salt.utils.version_cmp(version()['ApiVersion'], '1.15') > 0:
client = __context__['docker.client']
host_config_args = inspect_module.getargspec(docker.utils.create_host_config).args
create_kwargs['host_config'] = client.create_host_config(