summaryrefslogtreecommitdiff
path: root/cmd/podman/pods
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-21 02:11:22 +0100
committerGitHub <noreply@github.com>2020-11-21 02:11:22 +0100
commitb30ca110ec1deced8dc9322665f3d0ffe8e61bee (patch)
tree6284b74e5e6f4419af172fde21d317dbd061a117 /cmd/podman/pods
parentbff3bd610a3cc814fb5dde9dc62286f0f6c351c3 (diff)
parentf441190d10ca3d41e01a076e4b9b3a63746888b6 (diff)
downloadpodman-b30ca110ec1deced8dc9322665f3d0ffe8e61bee.tar.gz
podman-b30ca110ec1deced8dc9322665f3d0ffe8e61bee.tar.bz2
podman-b30ca110ec1deced8dc9322665f3d0ffe8e61bee.zip
Merge pull request #8410 from Luap99/fix-multiple-networks
Allow multiple --network flags for podman run/create
Diffstat (limited to 'cmd/podman/pods')
-rw-r--r--cmd/podman/pods/create.go28
1 files changed, 1 insertions, 27 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index d997ea344..5b0aa2fe4 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -171,33 +171,7 @@ 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")