diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-31 14:46:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 14:46:30 -0400 |
| commit | 398e7ceb86fec37c28720391914655387778b554 (patch) | |
| tree | 5e95293441a8aaef0952bcf9236eba82c4a76375 /libpod | |
| parent | dc67e6a182a09c8b65ef139fb9f15ddfdecae70f (diff) | |
| parent | 205c8c071e8550b2ddd57cfaa71af7345cfd5fe7 (diff) | |
| download | podman-398e7ceb86fec37c28720391914655387778b554.tar.gz podman-398e7ceb86fec37c28720391914655387778b554.tar.bz2 podman-398e7ceb86fec37c28720391914655387778b554.zip | |
Merge pull request #14433 from Luap99/restore-net
fix podman container restore without CreateNetNS
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_config.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_config.go b/libpod/container_config.go index ae3bc5865..30b84adcf 100644 --- a/libpod/container_config.go +++ b/libpod/container_config.go @@ -243,12 +243,12 @@ type ContainerNetworkConfig struct { // This cannot be set unless CreateNetNS is set. // If not set, the container will be dynamically assigned an IP by CNI. // Deprecated: Do no use this anymore, this is only for DB backwards compat. - StaticIP net.IP `json:"staticIP"` + StaticIP net.IP `json:"staticIP,omitempty"` // StaticMAC is a static MAC to request for the container. // This cannot be set unless CreateNetNS is set. // If not set, the container will be dynamically assigned a MAC by CNI. // Deprecated: Do no use this anymore, this is only for DB backwards compat. - StaticMAC types.HardwareAddr `json:"staticMAC"` + StaticMAC types.HardwareAddr `json:"staticMAC,omitempty"` // PortMappings are the ports forwarded to the container's network // namespace // These are not used unless CreateNetNS is true |