Usability cleanup for 'inspect'

Make the usage messages (and options) different between
podman inspect, podman image inspect, and podman container inspect.

Disable inapplicable options (-l, -s) for podman image inspect

Disable -t (type) when the type is implicit through the subcommand.

Update man page to reflect differences in usage.

Fix broken test.

Uglier than desirable due to Go and Cobra limitations

Signed-off-by: Ed Santiago <santiago@redhat.com>

1 files changed, 17 insertions, 1 deletions

diff --git a/cmd/podman/image.go b/cmd/podman/image.go
index 52bac6ecb..0e980d4d3 100644
--- a/cmd/podman/image.go
+++ b/cmd/podman/image.go
@@ -31,6 +31,19 @@ var (
 		Example: strings.Replace(_imagesCommand.Example, "podman images", "podman image list", -1),
 	}
 
+	inspectSubCommand  cliconfig.InspectValues
+	_inspectSubCommand = &cobra.Command{
+		Use:   strings.Replace(_inspectCommand.Use, "CONTAINER | ", "", 1),
+		Short: "Display the configuration of an image",
+		Long:  `Displays the low-level information on an image identified by name or ID.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			inspectSubCommand.InputArgs = args
+			inspectSubCommand.GlobalFlags = MainGlobalOpts
+			return inspectCmd(&inspectSubCommand)
+		},
+		Example: `podman image inspect alpine`,
+	}
+
 	rmSubCommand  cliconfig.RmiValues
 	_rmSubCommand = &cobra.Command{
 		Use:   strings.Replace(_rmiCommand.Use, "rmi", "rm", 1),
@@ -52,7 +65,7 @@ var imageSubCommands = []*cobra.Command{
 	_imagesSubCommand,
 	_imageExistsCommand,
 	_importCommand,
-	_inspectCommand,
+	_inspectSubCommand,
 	_loadCommand,
 	_pruneImagesCommand,
 	_pullCommand,
@@ -69,6 +82,9 @@ func init() {
 	imagesSubCommand.Command = _imagesSubCommand
 	imagesInit(&imagesSubCommand)
 
+	inspectSubCommand.Command = _inspectSubCommand
+	inspectInit(&inspectSubCommand)
+
 	imageCommand.SetUsageTemplate(UsageTemplate())
 	imageCommand.AddCommand(imageSubCommands...)
 	imageCommand.AddCommand(getImageSubCommands()...)