summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-05-31 14:06:53 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-31 20:09:38 +0000
commit824ea4da338891aff122f08f8f97b4d08b1a1e95 (patch)
tree05569ff183c1b92992cddb909d52faa9bdf6926e /cmd
parentd6b8f62dd6c42fbb32a62f67989317496e1c7e66 (diff)
downloadpodman-824ea4da338891aff122f08f8f97b4d08b1a1e95.tar.gz
podman-824ea4da338891aff122f08f8f97b4d08b1a1e95.tar.bz2
podman-824ea4da338891aff122f08f8f97b4d08b1a1e95.zip
Remove --net flag and make it an alias for --network
Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #862 Approved by: rhatdan
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/common.go7
-rw-r--r--cmd/podman/create.go6
2 files changed, 1 insertions, 12 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 635869609..63c41d01c 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -270,12 +270,7 @@ var createFlags = []cli.Flag{
Usage: "Assign a name to the container",
},
cli.StringFlag{
- Name: "net",
- Usage: "Connect a container to a network (alias for --network)",
- Value: "bridge",
- },
- cli.StringFlag{
- Name: "network",
+ Name: "net, network",
Usage: "Connect a container to a network",
Value: "bridge",
},
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index a751d32aa..89a8baf6d 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -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")
}
// 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"))
// Make sure if network is set to container namespace, port binding is not also being asked for
if netMode.IsContainer() {