summaryrefslogtreecommitdiff
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
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
-rw-r--r--cmd/podman/common.go6
-rw-r--r--cmd/podman/create.go7
-rw-r--r--cmd/podman/pod_create.go7
-rw-r--r--cmd/podman/run.go8
-rw-r--r--cmd/podman/run_test.go7
5 files changed, 31 insertions, 4 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index 797e74c98..4ddfd5e0a 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -216,8 +216,12 @@ var createFlags = []cli.Flag{
Name: "group-add",
Usage: "Add additional groups to join (default [])",
},
+ cli.BoolFlag{
+ Name: "help",
+ Hidden: true,
+ },
cli.StringFlag{
- Name: "hostname",
+ Name: "hostname, h",
Usage: "Set container hostname",
},
cli.StringFlag{
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 78b206543..6b5151c1b 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -49,6 +49,7 @@ var createCommand = cli.Command{
Flags: createFlags,
Action: createCmd,
ArgsUsage: "IMAGE [COMMAND [ARG...]]",
+ HideHelp: true,
SkipArgReorder: true,
UseShortOptionHandling: true,
}
@@ -57,6 +58,12 @@ func createCmd(c *cli.Context) error {
// TODO should allow user to create based off a directory on the host not just image
// Need CLI support for this
+ // 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
}
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
}
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
}
diff --git a/cmd/podman/run_test.go b/cmd/podman/run_test.go
index 397b3bb71..0a79f6ec3 100644
--- a/cmd/podman/run_test.go
+++ b/cmd/podman/run_test.go
@@ -17,9 +17,10 @@ var (
cmd = []string{"podman", "test", "alpine"}
CLI *cli.Context
testCommand = cli.Command{
- Name: "test",
- Flags: createFlags,
- Action: testCmd,
+ Name: "test",
+ Flags: createFlags,
+ Action: testCmd,
+ HideHelp: true,
}
)