diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-07-13 14:22:43 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-07-22 14:19:50 -0400 |
| commit | 31ecb728d21b155ece248ec44afab59e1d61437e (patch) | |
| tree | e0e01dcd516f08240fa8fdbe5356767263cbafb6 /libpod/container_inspect.go | |
| parent | 11f716094cf2f6654d0ea4ee75e2a0bedb18900c (diff) | |
| download | podman-31ecb728d21b155ece248ec44afab59e1d61437e.tar.gz podman-31ecb728d21b155ece248ec44afab59e1d61437e.tar.bz2 podman-31ecb728d21b155ece248ec44afab59e1d61437e.zip | |
Include infra container information in `pod inspect`
We had a field for this in the inspect data, but it was never
being populated. Because of this, `podman pod inspect` stopped
showing port bindings (and other infra container settings). Add
code to populate the infra container inspect data, and add a test
to ensure we don't regress again.
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 03684ddec..8c392d0d6 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -610,22 +610,11 @@ func (c *Container) generateInspectContainerHostConfig(ctrSpec *spec.Spec, named // Port bindings. // Only populate if we're using CNI to configure the network. - portBindings := make(map[string][]define.InspectHostPort) if c.config.CreateNetNS { - for _, port := range c.config.PortMappings { - key := fmt.Sprintf("%d/%s", port.ContainerPort, port.Protocol) - hostPorts := portBindings[key] - if hostPorts == nil { - hostPorts = []define.InspectHostPort{} - } - hostPorts = append(hostPorts, define.InspectHostPort{ - HostIP: port.HostIP, - HostPort: fmt.Sprintf("%d", port.HostPort), - }) - portBindings[key] = hostPorts - } + hostConfig.PortBindings = makeInspectPortBindings(c.config.PortMappings) + } else { + hostConfig.PortBindings = make(map[string][]define.InspectHostPort) } - hostConfig.PortBindings = portBindings // Cap add and cap drop. // We need a default set of capabilities to compare against. |