diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-07-16 12:19:51 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-07-16 22:37:27 +0200 |
| commit | 9be7029cdd4736f3ac33004e4364e3e7f3bd1db5 (patch) | |
| tree | 3471bf92af256dc4006f84a5f8fa4bcda090cdc2 /cmd/podman | |
| parent | 8d12f19371eb9d91139f7b982cde2926ec8c8e74 (diff) | |
| download | podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.tar.gz podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.tar.bz2 podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.zip | |
libpod: pass down network options
do not pass network specific options through the network namespace.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common/netflags.go | 8 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cmd/podman/common/netflags.go b/cmd/podman/common/netflags.go index 5c83a3c9c..82a82b310 100644 --- a/cmd/podman/common/netflags.go +++ b/cmd/podman/common/netflags.go @@ -2,6 +2,7 @@ package common import ( "net" + "strings" "github.com/containers/libpod/v2/cmd/podman/parse" "github.com/containers/libpod/v2/libpod/define" @@ -164,11 +165,18 @@ func NetFlagsToNetOptions(cmd *cobra.Command) (*entities.NetOptions, error) { return nil, err } + parts := strings.SplitN(network, ":", 2) + ns, cniNets, err := specgen.ParseNetworkNamespace(network) if err != nil { return nil, err } + if len(parts) > 1 { + opts.NetworkOptions = make(map[string][]string) + opts.NetworkOptions[parts[0]] = strings.Split(parts[1], ",") + cniNets = nil + } opts.Network = ns opts.CNINetworks = cniNets } diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 8a265cedf..08099da4b 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -417,6 +417,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string s.DNSOptions = c.Net.DNSOptions s.StaticIP = c.Net.StaticIP s.StaticMAC = c.Net.StaticMAC + s.NetworkOptions = c.Net.NetworkOptions s.UseImageHosts = c.Net.NoHosts s.ImageVolumeMode = c.ImageVolume |