зеркало из https://github.com/microsoft/docker.git
Quiet sysinfo warnings on container create/start
This was making logrus warn on each container create and start. These warnings are not needed as the code below already warns when these various cgroup settings aren't supported but have been set. Warnings were originally introduced by #15381, which appear to be a side-effect of that change and not the intention. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Родитель
66112a7ae5
Коммит
e9d8e38c47
|
@ -110,7 +110,7 @@ func (daemon *Daemon) adaptContainerSettings(hostConfig *runconfig.HostConfig, a
|
|||
// hostconfig and config structures.
|
||||
func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *runconfig.HostConfig, config *runconfig.Config) ([]string, error) {
|
||||
warnings := []string{}
|
||||
sysInfo := sysinfo.New(false)
|
||||
sysInfo := sysinfo.New(true)
|
||||
|
||||
if hostConfig.LxcConf.Len() > 0 && !strings.Contains(daemon.ExecutionDriver().Name(), "lxc") {
|
||||
return warnings, fmt.Errorf("Cannot use --lxc-conf with execdriver: %s", daemon.ExecutionDriver().Name())
|
||||
|
|
Загрузка…
Ссылка в новой задаче