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.
This commit is contained in:
Rohit Jnagal 2015-08-21 18:58:11 +00:00
parent 374e36d38e
commit 7a2f508b50

View File

@ -167,7 +167,16 @@ 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.
networkCount := 0
for _, n := range config.Networks {
if n.Type != "loopback" {
networkCount += 1
}
}
spec.HasNetwork = networkCount > 0
spec.HasDiskIo = true
return spec