add warnings when verify setting

Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 28b291dfda69b6595fbe81beaa45187ff6882313
Component: engine
This commit is contained in:
allencloud
2016-09-01 00:23:56 +08:00
parent 033314a228
commit 3c05615894

View File

@ -464,10 +464,13 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
}
w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update)
// no matter err is nil or not, w could have data in itself.
warnings = append(warnings, w...)
if err != nil {
return warnings, err
}
warnings = append(warnings, w...)
if hostConfig.ShmSize < 0 {
return warnings, fmt.Errorf("SHM size can not be less than 0")