Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows

Windows: Info no containerized check
This commit is contained in:
Brian Goff 2015-04-27 12:56:28 -04:00
Родитель 6856c69c41 ab97303cae
Коммит 97b35bab81
1 изменённых файлов: 9 добавлений и 5 удалений

Просмотреть файл

@ -33,11 +33,15 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
if s, err := operatingsystem.GetOperatingSystem(); err == nil {
operatingSystem = s
}
if inContainer, err := operatingsystem.IsContainerized(); err != nil {
logrus.Errorf("Could not determine if daemon is containerized: %v", err)
operatingSystem += " (error determining if containerized)"
} else if inContainer {
operatingSystem += " (containerized)"
// Don't do containerized check on Windows
if runtime.GOOS != "windows" {
if inContainer, err := operatingsystem.IsContainerized(); err != nil {
logrus.Errorf("Could not determine if daemon is containerized: %v", err)
operatingSystem += " (error determining if containerized)"
} else if inContainer {
operatingSystem += " (containerized)"
}
}
meminfo, err := system.ReadMemInfo()