diff options
| author | Valentin Rothberg <vrothberg@suse.com> | 2018-08-30 08:35:47 +0200 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-30 15:45:13 +0000 |
| commit | 6751b2c3504096286977490d2eb70047f054e207 (patch) | |
| tree | 864309d70710e90d2fb59d601aeb4911efe22ec8 /cmd/podman/run.go | |
| parent | 65c31d49f967c9b1da0984897be08f6238bc7705 (diff) | |
| download | podman-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/run.go')
| -rw-r--r-- | cmd/podman/run.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go index 997068a55..a6d0526ff 100644 --- a/cmd/podman/run.go +++ b/cmd/podman/run.go @@ -34,12 +34,20 @@ var runCommand = cli.Command{ Flags: runFlags, Action: runCmd, ArgsUsage: "IMAGE [COMMAND [ARG...]]", + HideHelp: true, SkipArgReorder: true, UseShortOptionHandling: true, } func runCmd(c *cli.Context) error { var imageName string + + // 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 } |