Windows: Info no containerized check

Signed-off-by: John Howard <jhoward@microsoft.com> Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc Component: engine
2015-04-27 08:38:01 -07:00
parent 5e258c2907
commit 513af8ec95
1 changed files with 9 additions and 5 deletions
@@ -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()