diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-10-09 15:38:45 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2020-10-09 20:20:19 -0400 |
commit | 77033c4aed90b15a567d12036ec636c53e2c8e15 (patch) | |
tree | 0cc4e4aa47edde51687a549dd71c97e36fd2230b /libpod | |
parent | cec240375d6dceb09c705d6d55e67aeff037327f (diff) | |
download | podman-77033c4aed90b15a567d12036ec636c53e2c8e15.tar.gz podman-77033c4aed90b15a567d12036ec636c53e2c8e15.tar.bz2 podman-77033c4aed90b15a567d12036ec636c53e2c8e15.zip |
Include CNI networks in inspect output when not running
We were only including the CNI Network fields in the output of
`podman inspect` when the container was not running. It's simple
enough to fix (populate with empty structs, since we can't fill
anything without a CNI response to get IP address assigned, etc).
This is necessary for Docker compatibility.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/networking_linux.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index d16bdc973..f87c311ce 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -828,6 +828,17 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e // We can't do more if the network is down. if c.state.NetNS == nil { + // We still want to make dummy configurations for each CNI net + // the container joined. + if len(c.config.Networks) > 0 { + settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(c.config.Networks)) + for _, net := range c.config.Networks { + cniNet := new(define.InspectAdditionalNetwork) + cniNet.NetworkID = net + settings.Networks[net] = cniNet + } + } + return settings, nil } |