toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

runconfig: split resources into a struct

Browse Source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1a0b483e02aff72c16871fb2f74644e091bda93c
Component: engine
This commit is contained in:
Antonio Murdaca
2015-11-18 20:03:08 +01:00
parent 4abbb3cdf7
commit 012bc4d1d4
4 changed files with 79 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/engine/builder/dockerfile/internals.go
View File

@ -498,19 +498,23 @@ func (b *Builder) create() (*daemon.Container, error) {
}
b.runConfig.Image = b.image
// TODO: why not embed a hostconfig in builder?
hostConfig := &runconfig.HostConfig{
resources := runconfig.Resources{
CgroupParent: b.CgroupParent,
CPUShares: b.CPUShares,
CPUPeriod: b.CPUPeriod,
CPUQuota: b.CPUQuota,
CpusetCpus: b.CPUSetCpus,
CpusetMems: b.CPUSetMems,
CgroupParent: b.CgroupParent,
Memory: b.Memory,
MemorySwap: b.MemorySwap,
ShmSize: b.ShmSize,
Ulimits: b.Ulimits,
Isolation: b.Isolation,
}
// TODO: why not embed a hostconfig in builder?
hostConfig := &runconfig.HostConfig{
Isolation: b.Isolation,
ShmSize: b.ShmSize,
Resources: resources,
}
config := *b.runConfig