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, 18 insertions, 1 deletions

diff --git a/cmd/podman/container.go b/cmd/podman/container.go
index 8ad8d7a44..ce6ad8883 100644
--- a/cmd/podman/container.go
+++ b/cmd/podman/container.go
@@ -19,6 +19,20 @@ var (
 		},
 	}
 
+	contInspectSubCommand  cliconfig.InspectValues
+	_contInspectSubCommand = &cobra.Command{
+		Use:   strings.Replace(_inspectCommand.Use, "| IMAGE", "", 1),
+		Short: "Display the configuration of a container",
+		Long:  `Displays the low-level information on a container identified by name or ID.`,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			contInspectSubCommand.InputArgs = args
+			contInspectSubCommand.GlobalFlags = MainGlobalOpts
+			return inspectCmd(&contInspectSubCommand)
+		},
+		Example: `podman container inspect myCtr
+  podman container inspect -l --format '{{.Id}} {{.Config.Labels}}'`,
+	}
+
 	listSubCommand  cliconfig.PsValues
 	_listSubCommand = &cobra.Command{
 		Use:     strings.Replace(_psCommand.Use, "ps", "list", 1),
@@ -37,12 +51,15 @@ var (
 	// Commands that are universally implemented.
 	containerCommands = []*cobra.Command{
 		_containerExistsCommand,
-		_inspectCommand,
+		_contInspectSubCommand,
 		_listSubCommand,
 	}
 )
 
 func init() {
+	contInspectSubCommand.Command = _contInspectSubCommand
+	inspectInit(&contInspectSubCommand)
+
 	listSubCommand.Command = _listSubCommand
 	psInit(&listSubCommand)