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

use hostConfig in verifyDaemonSettings

Browse source 
We have moved resource configs to hostConfig.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-04-11 16:37:28 +08:00
parent e3c1cc8d77
commit 39932511c1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/container.go
View file

@ -1282,13 +1282,13 @@ func (container *Container) initializeNetworking() error {
// Make sure the config is compatible with the current kernel // Make sure the config is compatible with the current kernel
func (container *Container) verifyDaemonSettings() { func (container *Container) verifyDaemonSettings() {
if container.Config.Memory > 0 && !container.daemon.sysInfo.MemoryLimit { if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {
logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.") logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
container.Config.Memory = 0 container.hostConfig.Memory = 0
} }
if container.Config.Memory > 0 && !container.daemon.sysInfo.SwapLimit { if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.SwapLimit {
logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.") logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")
container.Config.MemorySwap = -1 container.hostConfig.MemorySwap = -1
} }
if container.daemon.sysInfo.IPv4ForwardingDisabled { if container.daemon.sysInfo.IPv4ForwardingDisabled {
logrus.Warnf("IPv4 forwarding is disabled. Networking will not work") logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")