summaryrefslogtreecommitdiff
path: root/cmd/podman/common.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2018-01-15 14:17:31 -0600
committerAtomic Bot <atomic-devel@projectatomic.io>2018-01-15 21:17:59 +0000
commita7ad6e75ab967a51ee8dcd9c8dbc81c949e21d21 (patch)
treea4add509476edb2b71d9ec683d259207917add0a /cmd/podman/common.go
parent2e48c60bc5f7eb6b301c696f9e4c1cabaf1ec4aa (diff)
downloadpodman-a7ad6e75ab967a51ee8dcd9c8dbc81c949e21d21.tar.gz
podman-a7ad6e75ab967a51ee8dcd9c8dbc81c949e21d21.tar.bz2
podman-a7ad6e75ab967a51ee8dcd9c8dbc81c949e21d21.zip
Make --net alias to --network
A compatibility option of --net should alias the --network option. The --net option will only override --network if --network is not explicitly set and --net is. Both default to 'bridge'. Signed-off-by: baude <bbaude@redhat.com> Closes: #228 Approved by: mheon
Diffstat (limited to 'cmd/podman/common.go')
-rw-r--r--cmd/podman/common.go3
1 files changed, 2 insertions, 1 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",