kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

propagate CpuShares in mergeConfig

Browse source
This commit is contained in:
Jérôme Petazzoni 2013-05-07 11:44:38 -07:00
parent af9f559f2e
commit eef8b0d406
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builder.go
View file

@ -38,6 +38,9 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) {
if userConf.MemorySwap == 0 { if userConf.MemorySwap == 0 {
userConf.MemorySwap = imageConf.MemorySwap userConf.MemorySwap = imageConf.MemorySwap
} }
if userConf.CpuShares == 0 {
userConf.CpuShares = imageConf.CpuShares
}
if userConf.PortSpecs == nil || len(userConf.PortSpecs) == 0 { if userConf.PortSpecs == nil || len(userConf.PortSpecs) == 0 {
userConf.PortSpecs = imageConf.PortSpecs userConf.PortSpecs = imageConf.PortSpecs
} }