diff options
| author | Qi Wang <qiwan@redhat.com> | 2020-06-23 11:29:11 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-06-24 14:46:32 -0400 |
| commit | 639b809c80dc2fce76c4d24459d06c469777868f (patch) | |
| tree | e9e20619a0729b4b59f7c1302c1925e1c50280c7 /libpod/define | |
| parent | 01bc6bdda87b00f8050cd94a2ad807159ba0da8a (diff) | |
| download | podman-639b809c80dc2fce76c4d24459d06c469777868f.tar.gz podman-639b809c80dc2fce76c4d24459d06c469777868f.tar.bz2 podman-639b809c80dc2fce76c4d24459d06c469777868f.zip | |
Reformat inspect network settings
Reformat ports of inspect network settings to compatible with docker inspect. Close #5380
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'libpod/define')
| -rw-r--r-- | libpod/define/container_inspect.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libpod/define/container_inspect.go b/libpod/define/container_inspect.go index 27ada8706..3fbeb8f0b 100644 --- a/libpod/define/container_inspect.go +++ b/libpod/define/container_inspect.go @@ -5,7 +5,6 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/libpod/libpod/driver" - "github.com/cri-o/ocicni/pkg/ocicni" ) // InspectContainerConfig holds further data about how a container was initially @@ -571,13 +570,13 @@ type InspectAdditionalNetwork struct { type InspectNetworkSettings struct { InspectBasicNetworkConfig - Bridge string `json:"Bridge"` - SandboxID string `json:"SandboxID"` - HairpinMode bool `json:"HairpinMode"` - LinkLocalIPv6Address string `json:"LinkLocalIPv6Address"` - LinkLocalIPv6PrefixLen int `json:"LinkLocalIPv6PrefixLen"` - Ports []ocicni.PortMapping `json:"Ports"` - SandboxKey string `json:"SandboxKey"` + Bridge string `json:"Bridge"` + SandboxID string `json:"SandboxID"` + HairpinMode bool `json:"HairpinMode"` + LinkLocalIPv6Address string `json:"LinkLocalIPv6Address"` + LinkLocalIPv6PrefixLen int `json:"LinkLocalIPv6PrefixLen"` + Ports map[string][]InspectHostPort `json:"Ports"` + SandboxKey string `json:"SandboxKey"` // Networks contains information on non-default CNI networks this // container has joined. // It is a map of network name to network information. |