summaryrefslogtreecommitdiff
path: root/cmd/podman/pod_create.go
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@suse.com>2018-08-30 08:35:47 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-08-30 15:45:13 +0000
commit6751b2c3504096286977490d2eb70047f054e207 (patch)
tree864309d70710e90d2fb59d601aeb4911efe22ec8 /cmd/podman/pod_create.go
parent65c31d49f967c9b1da0984897be08f6238bc7705 (diff)
downloadpodman-6751b2c3504096286977490d2eb70047f054e207.tar.gz
podman-6751b2c3504096286977490d2eb70047f054e207.tar.bz2
podman-6751b2c3504096286977490d2eb70047f054e207.zip
run/create: reserve `-h` flag for hostname
Move the `-h` short flag from `--help` to `--hostname` for podman-run, podman-create and podman-pod-create to be compatible with Docker. Fixes: #1367 Signed-off-by: Valentin Rothberg <vrothberg@suse.com> Closes: #1373 Approved by: rhatdan
Diffstat (limited to 'cmd/podman/pod_create.go')
-rw-r--r--cmd/podman/pod_create.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/pod_create.go b/cmd/podman/pod_create.go
index 4eb3126e3..3e712619e 100644
--- a/cmd/podman/pod_create.go
+++ b/cmd/podman/pod_create.go
@@ -71,6 +71,7 @@ var podCreateCommand = cli.Command{
Description: podCreateDescription,
Flags: podCreateFlags,
Action: podCreateCmd,
+ HideHelp: true,
SkipArgReorder: true,
UseShortOptionHandling: true,
}
@@ -79,6 +80,12 @@ func podCreateCmd(c *cli.Context) error {
var options []libpod.PodCreateOption
var err error
+ // Docker-compatibility: the "-h" flag for run/create is reserved for
+ // the hostname (see https://github.com/containers/libpod/issues/1367).
+ if c.Bool("help") {
+ cli.ShowCommandHelpAndExit(c, "run", 0)
+ }
+
if err = validateFlags(c, createFlags); err != nil {
return err
}