diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-30 19:43:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-30 19:43:19 +0100 |
commit | 1613921ecc8e54a6d2ca6008a54ef16314bbb587 (patch) | |
tree | bd7471389cf3f1e42f56cc0f3fc26280c20f8117 /cmd/podman/pods/create.go | |
parent | f24812ac3ba969bc5a0628b819699d747c853e36 (diff) | |
parent | f3402c73d4a21dca68573babb3554c13cb878505 (diff) | |
download | podman-1613921ecc8e54a6d2ca6008a54ef16314bbb587.tar.gz podman-1613921ecc8e54a6d2ca6008a54ef16314bbb587.tar.bz2 podman-1613921ecc8e54a6d2ca6008a54ef16314bbb587.zip |
Merge pull request #8514 from Luap99/revert-8410-fix-multiple-networks
Revert "Allow multiple --network flags for podman run/create"
Diffstat (limited to 'cmd/podman/pods/create.go')
-rw-r--r-- | cmd/podman/pods/create.go | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index 5b0aa2fe4..d997ea344 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -171,7 +171,33 @@ func create(cmd *cobra.Command, args []string) error { if err != nil { return err } - + createOptions.Net.Network = specgen.Namespace{} + if cmd.Flag("network").Changed { + netInput, err := cmd.Flags().GetString("network") + if err != nil { + return err + } + parts := strings.SplitN(netInput, ":", 2) + + n := specgen.Namespace{} + switch { + case netInput == "bridge": + n.NSMode = specgen.Bridge + case netInput == "host": + n.NSMode = specgen.Host + case netInput == "slirp4netns", strings.HasPrefix(netInput, "slirp4netns:"): + n.NSMode = specgen.Slirp + if len(parts) > 1 { + createOptions.Net.NetworkOptions = make(map[string][]string) + createOptions.Net.NetworkOptions[parts[0]] = strings.Split(parts[1], ",") + } + default: + // Container and NS mode are presently unsupported + n.NSMode = specgen.Bridge + createOptions.Net.CNINetworks = strings.Split(netInput, ",") + } + createOptions.Net.Network = n + } if len(createOptions.Net.PublishPorts) > 0 { if !createOptions.Infra { return errors.Errorf("you must have an infra container to publish port bindings to the host") |