summaryrefslogtreecommitdiff
path: root/libpod/container_inspect.go
diff options
context:
space:
mode:
authorflouthoc <flouthoc.git@gmail.com>2021-07-29 16:25:18 +0530
committerflouthoc <flouthoc.git@gmail.com>2021-07-30 19:31:05 +0530
commit2a484e782a23ad67c98e22121fde2b83b4072d1a (patch)
tree4691b5c19020ec9281bda7e58dee88e6d63d753f /libpod/container_inspect.go
parentf17b810279fd04c3d574e8d3dcc1878d50083a68 (diff)
downloadpodman-2a484e782a23ad67c98e22121fde2b83b4072d1a.tar.gz
podman-2a484e782a23ad67c98e22121fde2b83b4072d1a.tar.bz2
podman-2a484e782a23ad67c98e22121fde2b83b4072d1a.zip
ps: support the container notation for ps --filter network=...
Signed-off-by: flouthoc <flouthoc.git@gmail.com>
Diffstat (limited to 'libpod/container_inspect.go')
-rw-r--r--libpod/container_inspect.go33
1 files changed, 1 insertions, 32 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go
index 638e0b756..8c662c488 100644
--- a/libpod/container_inspect.go
+++ b/libpod/container_inspect.go
@@ -618,38 +618,7 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named
hostConfig.Tmpfs = tmpfs
// Network mode parsing.
- networkMode := ""
- switch {
- case c.config.CreateNetNS:
- // We actually store the network
- // mode for Slirp and Bridge, so
- // we can just use that
- networkMode = string(c.config.NetMode)
- case c.config.NetNsCtr != "":
- networkMode = fmt.Sprintf("container:%s", c.config.NetNsCtr)
- default:
- // Find the spec's network namespace.
- // If there is none, it's host networking.
- // If there is one and it has a path, it's "ns:".
- foundNetNS := false
- for _, ns := range ctrSpec.Linux.Namespaces {
- if ns.Type == spec.NetworkNamespace {
- foundNetNS = true
- if ns.Path != "" {
- networkMode = fmt.Sprintf("ns:%s", ns.Path)
- } else {
- // We're making a network ns, but not
- // configuring with Slirp or CNI. That
- // means it's --net=none
- networkMode = "none"
- }
- break
- }
- }
- if !foundNetNS {
- networkMode = "host"
- }
- }
+ networkMode := c.NetworkMode()
hostConfig.NetworkMode = networkMode
// Port bindings.