docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity

propagate CpuShares in mergeConfig

Browse Source 
Upstream-commit: eef8b0d406412ffe6622ed1f2c858540eb7f75f1
Component: engine
This commit is contained in:
Jérôme Petazzoni
2013-05-07 11:44:38 -07:00
parent 65d10241c4
commit 84ab689e05
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/builder.go
View File

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