5 files changed, 160 insertions, 0 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 2d9e45177..8109eca2f 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -6,6 +6,7 @@ import (
 	_ "github.com/containers/libpod/cmd/podman/containers"
 	_ "github.com/containers/libpod/cmd/podman/healthcheck"
 	_ "github.com/containers/libpod/cmd/podman/images"
+	_ "github.com/containers/libpod/cmd/podman/manifest"
 	_ "github.com/containers/libpod/cmd/podman/networks"
 	_ "github.com/containers/libpod/cmd/podman/pods"
 	"github.com/containers/libpod/cmd/podman/registry"
diff --git a/cmd/podman/manifest/add.go b/cmd/podman/manifest/add.go
new file mode 100644
index 000000000..20251ca87
--- /dev/null
+++ b/cmd/podman/manifest/add.go
@@ -0,0 +1,49 @@
+package manifest
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	manifestAddOpts = entities.ManifestAddOptions{}
+	addCmd          = &cobra.Command{
+		Use:   "add",
+		Short: "Add images to a manifest list or image index",
+		Long:  "Adds an image to a manifest list or image index.",
+		RunE:  add,
+		Example: `podman manifest add mylist:v1.11 image:v1.11-amd64
+		podman manifest add mylist:v1.11 transport:imageName`,
+		Args: cobra.ExactArgs(2),
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: addCmd,
+		Parent:  manifestCmd,
+	})
+	flags := addCmd.Flags()
+	flags.BoolVar(&manifestAddOpts.All, "all", false, "add all of the list's images if the image is a list")
+	flags.StringSliceVar(&manifestAddOpts.Annotation, "annotation", nil, "set an `annotation` for the specified image")
+	flags.StringVar(&manifestAddOpts.Arch, "arch", "", "override the `architecture` of the specified image")
+	flags.StringSliceVar(&manifestAddOpts.Features, "features", nil, "override the `features` of the specified image")
+	flags.StringVar(&manifestAddOpts.OSVersion, "os-version", "", "override the OS `version` of the specified image")
+	flags.StringVar(&manifestAddOpts.Variant, "variant", "", "override the `Variant` of the specified image")
+}
+
+func add(cmd *cobra.Command, args []string) error {
+	manifestAddOpts.Images = []string{args[1], args[0]}
+	listID, err := registry.ImageEngine().ManifestAdd(context.Background(), manifestAddOpts)
+	if err != nil {
+		return errors.Wrapf(err, "error adding to manifest list %s", args[0])
+	}
+	fmt.Printf("%s\n", listID)
+	return nil
+}
diff --git a/cmd/podman/manifest/create.go b/cmd/podman/manifest/create.go
new file mode 100644
index 000000000..4f3e27774
--- /dev/null
+++ b/cmd/podman/manifest/create.go
@@ -0,0 +1,44 @@
+package manifest
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	manifestCreateOpts = entities.ManifestCreateOptions{}
+	createCmd          = &cobra.Command{
+		Use:   "create",
+		Short: "Create manifest list or image index",
+		Long:  "Creates manifest lists or image indexes.",
+		RunE:  create,
+		Example: `podman manifest create mylist:v1.11
+  podman manifest create mylist:v1.11 arch-specific-image-to-add
+  podman manifest create --all mylist:v1.11 transport:tagged-image-to-add`,
+		Args: cobra.MinimumNArgs(1),
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: createCmd,
+		Parent:  manifestCmd,
+	})
+	flags := createCmd.Flags()
+	flags.BoolVar(&manifestCreateOpts.All, "all", false, "add all of the lists' images if the images to add are lists")
+}
+
+func create(cmd *cobra.Command, args []string) error {
+	imageID, err := registry.ImageEngine().ManifestCreate(context.Background(), args[:1], args[1:], manifestCreateOpts)
+	if err != nil {
+		return errors.Wrapf(err, "error creating manifest %s", args[0])
+	}
+	fmt.Printf("%s\n", imageID)
+	return nil
+}
diff --git a/cmd/podman/manifest/inspect.go b/cmd/podman/manifest/inspect.go
new file mode 100644
index 000000000..36ecdc87b
--- /dev/null
+++ b/cmd/podman/manifest/inspect.go
@@ -0,0 +1,39 @@
+package manifest
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	inspectCmd = &cobra.Command{
+		Use:     "inspect IMAGE",
+		Short:   "Display the contents of a manifest list or image index",
+		Long:    "Display the contents of a manifest list or image index.",
+		RunE:    inspect,
+		Example: "podman manifest inspect localhost/list",
+		Args:    cobra.ExactArgs(1),
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: inspectCmd,
+		Parent:  manifestCmd,
+	})
+}
+
+func inspect(cmd *cobra.Command, args []string) error {
+	buf, err := registry.ImageEngine().ManifestInspect(context.Background(), args[0])
+	if err != nil {
+		return errors.Wrapf(err, "error inspect manifest %s", args[0])
+	}
+	fmt.Printf("%s\n", buf)
+	return nil
+}
diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go
new file mode 100644
index 000000000..b9ac7ea68
--- /dev/null
+++ b/cmd/podman/manifest/manifest.go
@@ -0,0 +1,27 @@
+package manifest
+
+import (
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/spf13/cobra"
+)
+
+var (
+	manifestDescription = "Creates, modifies, and pushes manifest lists and image indexes."
+	manifestCmd         = &cobra.Command{
+		Use:              "manifest",
+		Short:            "Manipulate manifest lists and image indexes",
+		Long:             manifestDescription,
+		TraverseChildren: true,
+		RunE:             registry.SubCommandExists,
+		Example: `podman manifest create localhost/list
+  podman manifest inspect localhost/list`,
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: manifestCmd,
+	})
+}