5 files changed, 68 insertions, 13 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)
 
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()...)
diff --git a/cmd/podman/inspect.go b/cmd/podman/inspect.go
index e14f25c24..3d6fd07e0 100644
--- a/cmd/podman/inspect.go
+++ b/cmd/podman/inspect.go
@@ -27,7 +27,7 @@ var (
 	inspectDescription = `This displays the low-level information on containers and images identified by name or ID.
 
   If given a name that matches both a container and an image, this command inspects the container.  By default, this will render all results in a JSON array.`
-	_inspectCommand = &cobra.Command{
+	_inspectCommand = cobra.Command{
 		Use:   "inspect [flags] CONTAINER | IMAGE",
 		Short: "Display the configuration of a container or image",
 		Long:  inspectDescription,
@@ -42,16 +42,34 @@ var (
 	}
 )
 
+func inspectInit(command *cliconfig.InspectValues) {
+	command.SetHelpTemplate(HelpTemplate())
+	command.SetUsageTemplate(UsageTemplate())
+	flags := command.Flags()
+	flags.StringVarP(&command.Format, "format", "f", "", "Change the output format to a Go template")
+
+	// -t flag applicable only to 'podman inspect', not 'image/container inspect'
+	ambiguous := strings.Contains(command.Use, "|")
+	if ambiguous {
+		flags.StringVarP(&command.TypeObject, "type", "t", inspectAll, "Return JSON for specified type, (image or container)")
+	}
+
+	if strings.Contains(command.Use, "CONTAINER") {
+		containers_only := " (containers only)"
+		if !ambiguous {
+			containers_only = ""
+			command.TypeObject = inspectTypeContainer
+		}
+		flags.BoolVarP(&command.Latest, "latest", "l", false, "Act on the latest container podman is aware of"+containers_only)
+		flags.BoolVarP(&command.Size, "size", "s", false, "Display total file size"+containers_only)
+		markFlagHiddenForRemoteClient("latest", flags)
+	} else {
+		command.TypeObject = inspectTypeImage
+	}
+}
 func init() {
-	inspectCommand.Command = _inspectCommand
-	inspectCommand.SetHelpTemplate(HelpTemplate())
-	inspectCommand.SetUsageTemplate(UsageTemplate())
-	flags := inspectCommand.Flags()
-	flags.StringVarP(&inspectCommand.TypeObject, "type", "t", inspectAll, "Return JSON for specified type, (e.g image, container or task)")
-	flags.StringVarP(&inspectCommand.Format, "format", "f", "", "Change the output format to a Go template")
-	flags.BoolVarP(&inspectCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of if the type is a container")
-	flags.BoolVarP(&inspectCommand.Size, "size", "s", false, "Display total file size if the type is container")
-	markFlagHiddenForRemoteClient("latest", flags)
+	inspectCommand.Command = &_inspectCommand
+	inspectInit(&inspectCommand)
 }
 
 func inspectCmd(c *cliconfig.InspectValues) error {
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 669860341..af6731d96 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -42,7 +42,7 @@ var mainCommands = []*cobra.Command{
 	&_imagesCommand,
 	_importCommand,
 	_infoCommand,
-	_inspectCommand,
+	&_inspectCommand,
 	_killCommand,
 	_loadCommand,
 	podCommand.Command,
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 130c5a32c..a92d5d3db 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -166,6 +166,10 @@ func runCmd(c *cliconfig.RunValues) error {
 		exitCode = int(ecode)
 	}
 
+	if c.IsSet("rm") {
+		runtime.RemoveContainer(ctx, ctr, false, true)
+	}
+
 	return nil
 }