docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Info no containerized check 

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-04-27 08:38:01 -07:00
parent 8dc07af52f
commit ab97303cae
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/info.go
View File

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