Manifest remove, push

Implements podman manifest remove and podman manifest push.

Signed-off-by: Qi Wang <qiwan@redhat.com>

3 files changed, 116 insertions, 1 deletions

diff --git a/cmd/podman/manifest/manifest.go b/cmd/podman/manifest/manifest.go
index 88d264c1f..d7f042a56 100644
--- a/cmd/podman/manifest/manifest.go
+++ b/cmd/podman/manifest/manifest.go
@@ -18,7 +18,9 @@ var (
 		Example: `podman manifest add mylist:v1.11 image:v1.11-amd64
   podman manifest create localhost/list
   podman manifest inspect localhost/list
-  podman manifest annotate --annotation left=right mylist:v1.11 image:v1.11-amd64`,
+  podman manifest annotate --annotation left=right mylist:v1.11 image:v1.11-amd64
+  podman manifest push mylist:v1.11 quay.io/myimagelist
+  podman manifest remove mylist:v1.11 sha256:15352d97781ffdf357bf3459c037be3efac4133dc9070c2dce7eca7c05c3e736`,
 	}
 )
 
diff --git a/cmd/podman/manifest/push.go b/cmd/podman/manifest/push.go
new file mode 100644
index 000000000..49c76f40b
--- /dev/null
+++ b/cmd/podman/manifest/push.go
@@ -0,0 +1,66 @@
+package manifest
+
+import (
+	"context"
+
+	"github.com/containers/common/pkg/auth"
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	manifestPushOpts = entities.ManifestPushOptions{}
+	pushCmd          = &cobra.Command{
+		Use:     "push [flags] SOURCE DESTINATION",
+		Short:   "Push a manifest list or image index to a registry",
+		Long:    "Pushes manifest lists and image indexes to registries.",
+		RunE:    push,
+		Example: `podman manifest push mylist:v1.11 quay.io/myimagelist`,
+		Args:    cobra.ExactArgs(2),
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: pushCmd,
+		Parent:  manifestCmd,
+	})
+	flags := pushCmd.Flags()
+	flags.BoolVar(&manifestPushOpts.Purge, "purge", false, "remove the manifest list if push succeeds")
+	flags.BoolVar(&manifestPushOpts.All, "all", false, "also push the images in the list")
+	flags.StringVar(&manifestPushOpts.Authfile, "authfile", auth.GetDefaultAuthFile(), "path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
+	flags.StringVar(&manifestPushOpts.CertDir, "cert-dir", "", "use certificates at the specified path to access the registry")
+	flags.StringVar(&manifestPushOpts.Creds, "creds", "", "use `[username[:password]]` for accessing the registry")
+	flags.StringVar(&manifestPushOpts.DigestFile, "digestfile", "", "after copying the image, write the digest of the resulting digest to the file")
+	flags.StringVarP(&manifestPushOpts.Format, "format", "f", "", "manifest type (oci or v2s2) to attempt to use when pushing the manifest list (default is manifest type of source)")
+	flags.BoolVarP(&manifestPushOpts.RemoveSignatures, "remove-signatures", "", false, "don't copy signatures when pushing images")
+	flags.StringVar(&manifestPushOpts.SignBy, "sign-by", "", "sign the image using a GPG key with the specified `FINGERPRINT`")
+	flags.BoolVar(&manifestPushOpts.TlsVerify, "tls-verify", true, "require HTTPS and verify certificates when accessing the registry")
+	flags.BoolVarP(&manifestPushOpts.Quiet, "quiet", "q", false, "don't output progress information when pushing lists")
+	if registry.IsRemote() {
+		_ = flags.MarkHidden("authfile")
+		_ = flags.MarkHidden("cert-dir")
+		_ = flags.MarkHidden("tls-verify")
+	}
+}
+
+func push(cmd *cobra.Command, args []string) error {
+	if err := auth.CheckAuthFile(manifestPushOpts.Authfile); err != nil {
+		return err
+	}
+	listImageSpec := args[0]
+	destSpec := args[1]
+	if listImageSpec == "" {
+		return errors.Errorf(`invalid image name "%s"`, listImageSpec)
+	}
+	if destSpec == "" {
+		return errors.Errorf(`invalid destination "%s"`, destSpec)
+	}
+	if err := registry.ImageEngine().ManifestPush(context.Background(), args, manifestPushOpts); err != nil {
+		return errors.Wrapf(err, "error pushing manifest %s to %s", listImageSpec, destSpec)
+	}
+	return nil
+}
diff --git a/cmd/podman/manifest/remove.go b/cmd/podman/manifest/remove.go
new file mode 100644
index 000000000..4d345efc0
--- /dev/null
+++ b/cmd/podman/manifest/remove.go
@@ -0,0 +1,47 @@
+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 (
+	removeCmd = &cobra.Command{
+		Use:     "remove [flags] LIST IMAGE",
+		Short:   "Remove an entry from a manifest list or image index",
+		Long:    "Removes an image from a manifest list or image index.",
+		RunE:    remove,
+		Example: `podman manifest remove mylist:v1.11 sha256:15352d97781ffdf357bf3459c037be3efac4133dc9070c2dce7eca7c05c3e736`,
+		Args:    cobra.ExactArgs(2),
+	}
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
+		Command: removeCmd,
+		Parent:  manifestCmd,
+	})
+}
+
+func remove(cmd *cobra.Command, args []string) error {
+	listImageSpec := args[0]
+	instanceSpec := args[1]
+	if listImageSpec == "" {
+		return errors.Errorf(`invalid image name "%s"`, listImageSpec)
+	}
+	if instanceSpec == "" {
+		return errors.Errorf(`invalid image digest "%s"`, instanceSpec)
+	}
+	updatedListID, err := registry.ImageEngine().ManifestRemove(context.Background(), args)
+	if err != nil {
+		return errors.Wrapf(err, "error removing from manifest list %s", listImageSpec)
+	}
+	fmt.Printf("%s\n", updatedListID)
+	return nil
+}