... | ... |
@@ -38,6 +38,9 @@ func (builder *Builder) mergeConfig(userConf, imageConf *Config) { |
38 | 38 |
if userConf.MemorySwap == 0 { |
39 | 39 |
userConf.MemorySwap = imageConf.MemorySwap |
40 | 40 |
} |
41 |
+ if userConf.CpuShares == 0 { |
|
42 |
+ userConf.CpuShares = imageConf.CpuShares |
|
43 |
+ } |
|
41 | 44 |
if userConf.PortSpecs == nil || len(userConf.PortSpecs) == 0 { |
42 | 45 |
userConf.PortSpecs = imageConf.PortSpecs |
43 | 46 |
} |