docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity

Merge pull request #17531 from crosbymichael/no-set-reservation

Browse Source 
Don't set mem soft limit if not specifiecd
Upstream-commit: 74362e8392bc60081c6083ab022ca5c6e6496134
Component: engine
This commit is contained in:
Tibor Vass
2015-10-30 17:01:36 -04:00
parent 4f1bd73407 73a0603e8b
commit 5d5868d289
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/daemon_unix.go
View File

@@ -115,9 +115,6 @@ func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, a
// By default, MemorySwap is set to twice the size of Memory.
hostConfig.MemorySwap = hostConfig.Memory * 2
}
if hostConfig.MemoryReservation == 0 && hostConfig.Memory > 0 {
hostConfig.MemoryReservation = hostConfig.Memory
}
}
// verifyPlatformContainerSettings performs platform-specific validation of the