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

Merge pull request #592 from docker/cpusetcpus 

Set 'CpusetCpus' with the value of the cpuset param in create_container
This commit is contained in:
Joffrey F 2015-05-08 11:42:25 -07:00
parent f28e90bfab 1f74262ab3
commit 8261a9175e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/utils/utils.py
View File

@ -577,6 +577,7 @@ def create_container_config(
'Entrypoint': entrypoint, 'Entrypoint': entrypoint,
'CpuShares': cpu_shares, 'CpuShares': cpu_shares,
'Cpuset': cpuset, 'Cpuset': cpuset,
'CpusetCpus': cpuset,
'WorkingDir': working_dir, 'WorkingDir': working_dir,
'MemorySwap': memswap_limit, 'MemorySwap': memswap_limit,
'HostConfig': host_config, 'HostConfig': host_config,

1
tests/test.py
View File

@ -489,6 +489,7 @@ class DockerClientTest(Cleanup, base.BaseTestCase):
"StdinOnce": false, "StdinOnce": false,
"NetworkDisabled": false, "NetworkDisabled": false,
"Cpuset": "0,1", "Cpuset": "0,1",
"CpusetCpus": "0,1",
"MemorySwap": 0}''')) "MemorySwap": 0}'''))
self.assertEqual(args[1]['headers'], self.assertEqual(args[1]['headers'],
{'Content-Type': 'application/json'}) {'Content-Type': 'application/json'})