Fix errors found when comparing podman v1 --help versus V2

Mainly add missing commands to podman image, podman containers, podman system

Also fix some informations messages and descriptions.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

1 files changed, 22 insertions, 1 deletions

diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go
index 1c0568762..0e16128ce 100644
--- a/cmd/podman/images/import.go
+++ b/cmd/podman/images/import.go
@@ -10,6 +10,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 var (
@@ -26,6 +27,17 @@ var (
   cat ctr.tar | podman -q import --message "importing the ctr.tar tarball" - image-imported
   cat ctr.tar | podman import -`,
 	}
+
+	imageImportCommand = &cobra.Command{
+		Args:  cobra.MinimumNArgs(1),
+		Use:   importCommand.Use,
+		Short: importCommand.Short,
+		Long:  importCommand.Long,
+		RunE:  importCommand.RunE,
+		Example: `podman image import http://example.com/ctr.tar url-image
+  cat ctr.tar | podman -q image import --message "importing the ctr.tar tarball" - image-imported
+  cat ctr.tar | podman image import -`,
+	}
 )
 
 var (
@@ -37,8 +49,17 @@ func init() {
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: importCommand,
 	})
+	importFlags(importCommand.Flags())
+
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: imageImportCommand,
+		Parent:  imageCmd,
+	})
+	importFlags(imageImportCommand.Flags())
+}
 
-	flags := importCommand.Flags()
+func importFlags(flags *pflag.FlagSet) {
 	flags.StringArrayVarP(&importOpts.Changes, "change", "c", []string{}, "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR")
 	flags.StringVarP(&importOpts.Message, "message", "m", "", "Set commit message for imported image")
 	flags.BoolVarP(&importOpts.Quiet, "quiet", "q", false, "Suppress output")