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

Merge pull request #26205 from allencloud/fix-warnings-append

Browse source 
add warnings when verifying container settings
This commit is contained in:
Brian Goff 2016-09-08 12:10:37 -04:00 • committed by GitHub
commit b1dfefc4bb
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/daemon_unix.go
View file

@ -464,10 +464,13 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
} }
w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update) 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 { if err != nil {
return warnings, err return warnings, err
} }
warnings = append(warnings, w...)
if hostConfig.ShmSize < 0 { if hostConfig.ShmSize < 0 {
return warnings, fmt.Errorf("SHM size can not be less than 0") return warnings, fmt.Errorf("SHM size can not be less than 0")