docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move 'cpuset' to the end of the param list

This commit is contained in:
groundeffect 2014-10-25 23:57:50 +02:00
parent 4388157fef
commit 6a52269888
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/client.py
View File

@ -102,8 +102,8 @@ class Client(requests.Session):
mem_limit=0, ports=None, environment=None, dns=None,
volumes=None, volumes_from=None,
network_disabled=False, entrypoint=None,
cpu_shares=None, cpuset=None, working_dir=None,
domainname=None, memswap_limit=0):
cpu_shares=None, working_dir=None,
domainname=None, memswap_limit=0, cpuset=None):
if isinstance(command, six.string_types):
command = shlex.split(str(command))
if isinstance(environment, dict):
@ -501,8 +501,8 @@ class Client(requests.Session):
mem_limit=0, ports=None, environment=None, dns=None,
volumes=None, volumes_from=None,
network_disabled=False, name=None, entrypoint=None,
cpu_shares=None, cpuset=None, working_dir=None,
domainname=None, memswap_limit=0):
cpu_shares=None, working_dir=None,
domainname=None, memswap_limit=0, cpuset=None):
if isinstance(volumes, six.string_types):
volumes = [volumes, ]
@ -510,8 +510,8 @@ class Client(requests.Session):
config = self._container_config(
image, command, hostname, user, detach, stdin_open, tty, mem_limit,
ports, environment, dns, volumes, volumes_from, network_disabled,
entrypoint, cpu_shares, cpuset, working_dir, domainname,
memswap_limit
entrypoint, cpu_shares, working_dir, domainname,
memswap_limit, cpuset
)
return self.create_container_from_config(config, name)