summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-24 21:33:15 +0100
committerGitHub <noreply@github.com>2019-02-24 21:33:15 +0100
commit553ac800c87b31de0bb22ae0c6f2e2e24bdcfe73 (patch)
tree8bdc72b207e6b2762376ac59dd05b5f836587180 /cmd
parent53b147d215df89144fcfe00fcf084acf9368f4a2 (diff)
parent3642ce837f9307a6724d3fe863e6a55f2b3acf9b (diff)
downloadpodman-553ac800c87b31de0bb22ae0c6f2e2e24bdcfe73.tar.gz
podman-553ac800c87b31de0bb22ae0c6f2e2e24bdcfe73.tar.bz2
podman-553ac800c87b31de0bb22ae0c6f2e2e24bdcfe73.zip
Merge pull request #2419 from rhatdan/play
Fix play to show up in podman help
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/commands.go3
-rw-r--r--cmd/podman/generate.go13
2 files changed, 9 insertions, 7 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 310ec8378..fef5f1763 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -16,8 +16,9 @@ func getMainCommands() []*cobra.Command {
_createCommand,
_diffCommand,
_execCommand,
- generateCommand.Command,
+ _generateCommand,
_containerKubeCommand,
+ _playCommand,
_psCommand,
_loginCommand,
_logoutCommand,
diff --git a/cmd/podman/generate.go b/cmd/podman/generate.go
index 66cb7a465..773d625ee 100644
--- a/cmd/podman/generate.go
+++ b/cmd/podman/generate.go
@@ -5,17 +5,18 @@ import (
"github.com/spf13/cobra"
)
-var generateDescription = "Generate structured data based for a containers and pods"
-var generateCommand = cliconfig.PodmanCommand{
-
- Command: &cobra.Command{
+var (
+ generateCommand cliconfig.PodmanCommand
+ generateDescription = "Generate structured data based for a containers and pods"
+ _generateCommand = &cobra.Command{
Use: "generate",
Short: "Generated structured data",
Long: generateDescription,
- },
-}
+ }
+)
func init() {
+ generateCommand.Command = _generateCommand
generateCommand.AddCommand(getGenerateSubCommands()...)
generateCommand.SetUsageTemplate(UsageTemplate())
}