From 4f699db8dad05b770b4e02d3de67137517c3463b Mon Sep 17 00:00:00 2001 From: baude Date: Thu, 12 Jul 2018 09:51:31 -0500 Subject: Support multiple networks This is a refresh of Dan William's PR #974 with a rebase and proper vendoring of ocicni and containernetworking/cni. It adds the ability to define multiple networks as so: podman run --network=net1,net2,foobar ... Signed-off-by: baude Closes: #1082 Approved by: baude --- libpod/options.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libpod/options.go') diff --git a/libpod/options.go b/libpod/options.go index c02bd4336..718b44930 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -733,7 +733,7 @@ func WithDependencyCtrs(ctrs []*Container) CtrCreateOption { // namespace with a minimal configuration. // An optional array of port mappings can be provided. // Conflicts with WithNetNSFrom(). -func WithNetNS(portMappings []ocicni.PortMapping, postConfigureNetNS bool) CtrCreateOption { +func WithNetNS(portMappings []ocicni.PortMapping, postConfigureNetNS bool, networks []string) CtrCreateOption { return func(ctr *Container) error { if ctr.valid { return ErrCtrFinalized @@ -746,6 +746,7 @@ func WithNetNS(portMappings []ocicni.PortMapping, postConfigureNetNS bool) CtrCr ctr.config.PostConfigureNetNS = postConfigureNetNS ctr.config.CreateNetNS = true ctr.config.PortMappings = portMappings + ctr.config.Networks = networks return nil } -- cgit v1.2.3-54-g00ecf