Merge branch 'master' of https://github.com/gferon/docker-py into gferon-master

This commit is contained in:
Joffrey F 2016-03-23 11:55:02 -07:00
commit 40d8d37c65
1 changed files with 3 additions and 1 deletions

View File

@ -21,7 +21,8 @@ class NetworkApiMixin(object):
return self._result(res, json=True)
@minimum_version('1.21')
def create_network(self, name, driver=None, options=None, ipam=None):
def create_network(self, name, driver=None, options=None, ipam=None,
check_duplicate=None):
if options is not None and not isinstance(options, dict):
raise TypeError('options must be a dictionary')
@ -30,6 +31,7 @@ class NetworkApiMixin(object):
'Driver': driver,
'Options': options,
'IPAM': ipam,
'CheckDuplicate': check_duplicate
}
url = self._url("/networks/create")
res = self._post_json(url, data=data)