diff options
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common.go | 3 | ||||
| -rw-r--r-- | cmd/podman/create.go | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 8944e49a5..ae4bbd65d 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -316,7 +316,8 @@ var createFlags = []cli.Flag{ }, cli.StringFlag{ Name: "net", - Usage: "Setup the network namespace", + Usage: "Connect a container to a network (alias for --network)", + Value: "bridge", }, cli.StringFlag{ Name: "network", diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 14c520174..83115c527 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -542,6 +542,17 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, if err != nil { return nil, errors.Wrapf(err, "unable to translate --shm-size") } + // Network + // Both --network and --net have default values of 'bridge' + // --net only overrides --network when --network is not explicitly + // set and --net is. + if c.IsSet("network") && c.IsSet("net") { + return nil, errors.Errorf("cannot use --network and --net together. use only --network instead") + } + networkMode := c.String("network") + if !c.IsSet("network") && c.IsSet("net") { + networkMode = c.String("net") + } config := &createConfig{ Runtime: runtime, @@ -570,10 +581,10 @@ func parseCreateOpts(c *cli.Context, runtime *libpod.Runtime, imageName string, LogDriverOpt: c.StringSlice("log-opt"), MacAddress: c.String("mac-address"), Name: c.String("name"), - Network: c.String("network"), + Network: networkMode, NetworkAlias: c.StringSlice("network-alias"), IpcMode: ipcMode, - NetMode: container.NetworkMode(c.String("network")), + NetMode: container.NetworkMode(networkMode), UtsMode: utsMode, PidMode: pidMode, Pod: c.String("pod"), |