Merge pull request #24549 from cpuguy83/fix_nil_meminfo
Fix panic when meminfo couldn't be read Upstream-commit: 534c3e328fa14cee9b012b18faa35fd1571703ef Component: engine
This commit is contained in:
@ -51,6 +51,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
|
||||
meminfo, err := system.ReadMemInfo()
|
||||
if err != nil {
|
||||
logrus.Errorf("Could not read system memory info: %v", err)
|
||||
meminfo = &system.MemInfo{}
|
||||
}
|
||||
|
||||
sysInfo := sysinfo.New(true)
|
||||
|
||||
Reference in New Issue
Block a user