clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 05:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11844 from jbarbier/cgroup-parent-42

Browse Source 
Adding cgroup-parent option for docker build
This commit is contained in:
Arnaud Porterie
2015-05-05 14:46:47 -07:00
parent f0a8dfd29e 9dbe12b792
commit e960e4bb12
8 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/internals.go
+7 -6
View File
@@ -552,12 +552,13 @@ func (b *Builder) create() (*daemon.Container, error) {
b.Config.Image = b.image
hostConfig := &runconfig.HostConfig{
CpuShares: b.cpuShares,
CpuQuota: b.cpuQuota,
CpusetCpus: b.cpuSetCpus,
CpusetMems: b.cpuSetMems,
Memory: b.memory,
MemorySwap: b.memorySwap,
CpuShares: b.cpuShares,
CpuQuota: b.cpuQuota,
CpusetCpus: b.cpuSetCpus,
CpusetMems: b.cpuSetMems,
CgroupParent: b.cgroupParent,
Memory: b.memory,
MemorySwap: b.memorySwap,
}
config := *b.Config