3 files changed, 60 insertions, 18 deletions
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
index dd98dc4d6..7cfacfc6c 100644
--- a/cmd/podman/images/diff.go
+++ b/cmd/podman/images/diff.go
@@ -11,8 +11,8 @@ import (
 var (
 	// podman container _inspect_
 	diffCmd = &cobra.Command{
-		Use:   "diff [flags] CONTAINER",
-		Args:  registry.IdOrLatestArgs,
+		Use:   "diff [flags] IMAGE",
+		Args:  cobra.ExactArgs(1),
 		Short: "Inspect changes on image's file systems",
 		Long:  `Displays changes on a image's filesystem.  The image will be compared to its parent layer.`,
 		RunE:  diff,
@@ -32,16 +32,16 @@ func init() {
 	diffOpts = &entities.DiffOptions{}
 	flags := diffCmd.Flags()
 	flags.BoolVar(&diffOpts.Archive, "archive", true, "Save the diff as a tar archive")
-	_ = flags.MarkHidden("archive")
+	_ = flags.MarkDeprecated("archive", "Provided for backwards compatibility, has no impact on output.")
 	flags.StringVar(&diffOpts.Format, "format", "", "Change the output format")
 }
 
 func diff(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 && !diffOpts.Latest {
-		return errors.New("image must be specified: podman image diff [options [...]] ID-NAME")
+	if diffOpts.Latest {
+		return errors.New("image diff does not support --latest")
 	}
 
-	results, err := registry.ImageEngine().Diff(registry.GetContext(), args[0], entities.DiffOptions{})
+	results, err := registry.ImageEngine().Diff(registry.GetContext(), args[0], *diffOpts)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index 4482ceee5..11bef02ba 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -20,11 +20,13 @@ import (
 var (
 	// Command: podman image _inspect_
 	inspectCmd = &cobra.Command{
-		Use:     "inspect [flags] IMAGE",
-		Short:   "Display the configuration of an image",
-		Long:    `Displays the low-level information on an image identified by name or ID.`,
-		RunE:    inspect,
-		Example: `podman image inspect alpine`,
+		Use:   "inspect [flags] IMAGE",
+		Short: "Display the configuration of an image",
+		Long:  `Displays the low-level information on an image identified by name or ID.`,
+		RunE:  inspect,
+		Example: `podman inspect alpine
+  podman inspect --format "imageId: {{.Id}} size: {{.Size}}" alpine
+  podman inspect --format "image: {{.ImageName}} driver: {{.Driver}}" myctr`,
 	}
 	inspectOpts *entities.InspectOptions
 )
@@ -39,14 +41,14 @@ func init() {
 }
 
 func inspect(cmd *cobra.Command, args []string) error {
-	latestContainer := inspectOpts.Latest
-
-	if len(args) == 0 && !latestContainer {
-		return errors.Errorf("container or image name must be specified: podman inspect [options [...]] name")
+	if inspectOpts.Size {
+		return fmt.Errorf("--size can only be used for containers")
 	}
-
-	if len(args) > 0 && latestContainer {
-		return errors.Errorf("you cannot provide additional arguments with --latest")
+	if inspectOpts.Latest {
+		return fmt.Errorf("--latest can only be used for containers")
+	}
+	if len(args) == 0 {
+		return errors.Errorf("image name must be specified: podman image inspect [options [...]] name")
 	}
 
 	results, err := registry.ImageEngine().Inspect(context.Background(), args, *inspectOpts)
diff --git a/cmd/podman/images/tree.go b/cmd/podman/images/tree.go
new file mode 100644
index 000000000..5e82e9dea
--- /dev/null
+++ b/cmd/podman/images/tree.go
@@ -0,0 +1,40 @@
+package images
+
+import (
+	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+)
+
+var (
+	treeDescription = "Prints layer hierarchy of an image in a tree format"
+	treeCmd         = &cobra.Command{
+		Use:     "tree [flags] IMAGE",
+		Args:    cobra.ExactArgs(1),
+		Short:   treeDescription,
+		Long:    treeDescription,
+		RunE:    tree,
+		Example: "podman image tree alpine:latest",
+	}
+	treeOpts entities.ImageTreeOptions
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: treeCmd,
+		Parent:  imageCmd,
+	})
+	treeCmd.Flags().BoolVar(&treeOpts.WhatRequires, "whatrequires", false, "Show all child images and layers of the specified image")
+}
+
+func tree(_ *cobra.Command, args []string) error {
+	results, err := registry.ImageEngine().Tree(registry.Context(), args[0], treeOpts)
+	if err != nil {
+		return err
+	}
+	fmt.Println(results.Tree)
+	return nil
+}