diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-08-24 10:30:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 10:30:11 -0400 |
| commit | e9daaf62e3921b8c696f3abd92f001a9447c8aa1 (patch) | |
| tree | ea500d48f28682ad36f6eb4954717c6629fb68b4 /pkg/domain/entities | |
| parent | e20ec47a59b4ac65d42f3fee7b8b7ec5760ea35d (diff) | |
| parent | c0b1edd6a4dcad2b89a01975988d186b21b3158e (diff) | |
| download | podman-e9daaf62e3921b8c696f3abd92f001a9447c8aa1.tar.gz podman-e9daaf62e3921b8c696f3abd92f001a9447c8aa1.tar.bz2 podman-e9daaf62e3921b8c696f3abd92f001a9447c8aa1.zip | |
Merge pull request #11232 from Luap99/network
Network interface
Diffstat (limited to 'pkg/domain/entities')
| -rw-r--r-- | pkg/domain/entities/containers.go | 3 | ||||
| -rw-r--r-- | pkg/domain/entities/types.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index d2a7505a8..607e68256 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -8,6 +8,7 @@ import ( "github.com/containers/image/v5/types" "github.com/containers/podman/v3/libpod/define" + nettypes "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/storage/pkg/archive" "github.com/cri-o/ocicni/pkg/ocicni" @@ -208,7 +209,7 @@ type RestoreOptions struct { Name string TCPEstablished bool ImportPrevious string - PublishPorts []specgen.PortMapping + PublishPorts []nettypes.PortMapping Pod string } diff --git a/pkg/domain/entities/types.go b/pkg/domain/entities/types.go index 9e25b7bf8..db4c6bb8a 100644 --- a/pkg/domain/entities/types.go +++ b/pkg/domain/entities/types.go @@ -6,6 +6,7 @@ import ( buildahDefine "github.com/containers/buildah/define" "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/events" + "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/storage/pkg/archive" ) @@ -40,7 +41,7 @@ type NetOptions struct { DNSServers []net.IP Network specgen.Namespace NoHosts bool - PublishPorts []specgen.PortMapping + PublishPorts []types.PortMapping StaticIP *net.IP StaticMAC *net.HardwareAddr // NetworkOptions are additional options for each network |