Skip to content

Commit 8261a91

Browse files
committed
Merge pull request #592 from docker/cpusetcpus
Set 'CpusetCpus' with the value of the cpuset param in create_container
2 parents f28e90b + 1f74262 commit 8261a91

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

docker/utils/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,7 @@ def create_container_config(
577577
'Entrypoint': entrypoint,
578578
'CpuShares': cpu_shares,
579579
'Cpuset': cpuset,
580+
'CpusetCpus': cpuset,
580581
'WorkingDir': working_dir,
581582
'MemorySwap': memswap_limit,
582583
'HostConfig': host_config,

tests/test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ def test_create_container_with_cpuset(self):
489489
"StdinOnce": false,
490490
"NetworkDisabled": false,
491491
"Cpuset": "0,1",
492+
"CpusetCpus": "0,1",
492493
"MemorySwap": 0}'''))
493494
self.assertEqual(args[1]['headers'],
494495
{'Content-Type': 'application/json'})

0 commit comments

Comments
 (0)