Fix network info for docker containers running with --net=host.

Docker still reports a loop device for these. Need to check for more than one device to mark network as available.
google · Aug 21, 2015 · 2da1f25 · 2da1f25
1 parent 374e36d
commit 2da1f25
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/container/docker/handler.go b/container/docker/handler.go
@@ -167,7 +167,9 @@ func libcontainerConfigToContainerSpec(config *libcontainerConfigs.Config, mi *i
 	}
 	spec.Cpu.Mask = utils.FixCpuMask(config.Cgroups.CpusetCpus, mi.NumCores)
 
-	spec.HasNetwork = len(config.Networks) > 0
+	// Docker reports a loop device for containers with --net=host. Ignore
+	// those too.
+	spec.HasNetwork = len(config.Networks) > 1
 	spec.HasDiskIo = true
 
 	return spec