opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove --net flag and make it an alias for --network

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #862
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-05-31 14:06:53 -04:00
committed by Atomic Bot
parent d6b8f62dd6
commit 824ea4da33
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/podman/common.go
View File

@ -270,12 +270,7 @@ var createFlags = []cli.Flag{
Usage: "Assign a name to the container", Usage: "Assign a name to the container",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "net", Name: "net, network",
Usage: "Connect a container to a network (alias for --network)",
Value: "bridge",
},
cli.StringFlag{
Name: "network",
Usage: "Connect a container to a network", Usage: "Connect a container to a network",
Value: "bridge", Value: "bridge",
}, },

6
cmd/podman/create.go
View File

@ -424,12 +424,6 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
return nil, errors.Wrapf(err, "unable to translate --shm-size") return nil, errors.Wrapf(err, "unable to translate --shm-size")
} }
// Network // 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")
}
netMode := container.NetworkMode(c.String("network")) netMode := container.NetworkMode(c.String("network"))
// Make sure if network is set to container namespace, port binding is not also being asked for // Make sure if network is set to container namespace, port binding is not also being asked for
if netMode.IsContainer() { if netMode.IsContainer() {