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

Remove unused argument from verifyPlatformContainerSettings

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2018-12-18 23:20:17 +01:00
parent 10c97b9357
commit e278678705
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/container.go
View file

@ -345,7 +345,7 @@ func (daemon *Daemon) verifyContainerSettings(platform string, hostConfig *conta
} }
// Now do platform-specific verification // Now do platform-specific verification
warnings, err = verifyPlatformContainerSettings(daemon, hostConfig, config, update) warnings, err = verifyPlatformContainerSettings(daemon, hostConfig, update)
for _, w := range warnings { for _, w := range warnings {
logrus.Warn(w) logrus.Warn(w)
} }

2
daemon/daemon_unix.go
View file

@ -560,7 +560,7 @@ func UsingSystemd(config *config.Config) bool {
// verifyPlatformContainerSettings performs platform-specific validation of the // verifyPlatformContainerSettings performs platform-specific validation of the
// hostconfig and config structures. // hostconfig and config structures.
func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) (warnings []string, err error) { func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, update bool) (warnings []string, err error) {
sysInfo := sysinfo.New(true) sysInfo := sysinfo.New(true)
w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update) w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update)

2
daemon/daemon_windows.go
View file

@ -186,7 +186,7 @@ func verifyContainerResources(resources *containertypes.Resources, isHyperv bool
// verifyPlatformContainerSettings performs platform-specific validation of the // verifyPlatformContainerSettings performs platform-specific validation of the
// hostconfig and config structures. // hostconfig and config structures.
func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) (warnings []string, err error) { func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, update bool) (warnings []string, err error) {
osv := system.GetOSVersion() osv := system.GetOSVersion()
hyperv := daemon.runAsHyperVContainer(hostConfig) hyperv := daemon.runAsHyperVContainer(hostConfig)