diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-07 13:47:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 13:47:55 -0800 |
| commit | 94e89fc6cac0ac67db9228967f0340b60235bed8 (patch) | |
| tree | 980c7dec92a361532a18c601f3fb34767e99b0f4 /cmd/podman/import.go | |
| parent | 1b253cf73a360557196213684cec63b37407ed7c (diff) | |
| parent | 9a39c60e46d927489efa0ef5d4ece7c76fceceb7 (diff) | |
| download | podman-94e89fc6cac0ac67db9228967f0340b60235bed8.tar.gz podman-94e89fc6cac0ac67db9228967f0340b60235bed8.tar.bz2 podman-94e89fc6cac0ac67db9228967f0340b60235bed8.zip | |
Merge pull request #2564 from rhatdan/cleanup
Fix help commands to show short and long description.
Diffstat (limited to 'cmd/podman/import.go')
| -rw-r--r-- | cmd/podman/import.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/podman/import.go b/cmd/podman/import.go index ddf1bd802..c3351ab1b 100644 --- a/cmd/podman/import.go +++ b/cmd/podman/import.go @@ -13,9 +13,9 @@ var ( importCommand cliconfig.ImportValues importDescription = `Create a container image from the contents of the specified tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz). - Note remote tar balls can be specified, via web address. - Optionally tag the image. You can specify the instructions using the --change option. - ` + + Note remote tar balls can be specified, via web address. + Optionally tag the image. You can specify the instructions using the --change option.` _importCommand = &cobra.Command{ Use: "import [flags] PATH [REFERENCE]", Short: "Import a tarball to create a filesystem image", @@ -33,6 +33,7 @@ var ( func init() { importCommand.Command = _importCommand + importCommand.SetHelpTemplate(HelpTemplate()) importCommand.SetUsageTemplate(UsageTemplate()) flags := importCommand.Flags() flags.StringSliceVarP(&importCommand.Change, "change", "c", []string{}, "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR") |