From 513af8ec95cce62e13fc356c5a83a342479d707a Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 27 Apr 2015 08:38:01 -0700 Subject: [PATCH] Windows: Info no containerized check Signed-off-by: John Howard Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc Component: engine --- components/engine/daemon/info.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/engine/daemon/info.go b/components/engine/daemon/info.go index 270abda598..df1c0530cc 100644 --- a/components/engine/daemon/info.go +++ b/components/engine/daemon/info.go @@ -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()