3 files changed, 65 insertions, 10 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 83c039ed3..022c90f71 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -85,7 +85,7 @@ func images(cmd *cobra.Command, args []string) error {
 		return errors.New("cannot specify an image and a filter(s)")
 	}
 
-	if len(listOptions.Filter) < 1 && len(args) > 0 {
+	if len(args) > 0 {
 		listOptions.Filter = append(listOptions.Filter, "reference="+args[0])
 	}
 
@@ -152,10 +152,16 @@ func writeTemplate(imageS []*entities.ImageSummary) error {
 	)
 	imgs := make([]imageReporter, 0, len(imageS))
 	for _, e := range imageS {
-		for _, tag := range e.RepoTags {
-			var h imageReporter
+		var h imageReporter
+		if len(e.RepoTags) > 0 {
+			for _, tag := range e.RepoTags {
+				h.ImageSummary = *e
+				h.Repository, h.Tag = tokenRepoTag(tag)
+				imgs = append(imgs, h)
+			}
+		} else {
 			h.ImageSummary = *e
-			h.Repository, h.Tag = tokenRepoTag(tag)
+			h.Repository = "<none>"
 			imgs = append(imgs, h)
 		}
 		listFlag.readOnly = e.IsReadOnly()
diff --git a/cmd/podman/images/prune.go b/cmd/podman/images/prune.go
index 7c9e3eb61..676382a99 100644
--- a/cmd/podman/images/prune.go
+++ b/cmd/podman/images/prune.go
@@ -61,12 +61,6 @@ Are you sure you want to continue? [y/N] `)
 		}
 	}
 
-	// TODO Remove once filter refactor is finished and url.Values rules :)
-	for _, f := range filter {
-		t := strings.SplitN(f, "=", 2)
-		pruneOpts.Filters.Add(t[0], t[1])
-	}
-
 	results, err := registry.ImageEngine().Prune(registry.GetContext(), pruneOpts)
 	if err != nil {
 		return err
diff --git a/cmd/podman/images/sign.go b/cmd/podman/images/sign.go
new file mode 100644
index 000000000..bd9cf2ea7
--- /dev/null
+++ b/cmd/podman/images/sign.go
@@ -0,0 +1,55 @@
+package images
+
+import (
+	"os"
+
+	"github.com/containers/libpod/cmd/podman/registry"
+	"github.com/containers/libpod/pkg/domain/entities"
+	"github.com/pkg/errors"
+	"github.com/spf13/cobra"
+)
+
+var (
+	signDescription = "Create a signature file that can be used later to verify the image."
+	signCommand     = &cobra.Command{
+		Use:   "sign [flags] IMAGE [IMAGE...]",
+		Short: "Sign an image",
+		Long:  signDescription,
+		RunE:  sign,
+		Args:  cobra.MinimumNArgs(1),
+		Example: `podman image sign --sign-by mykey imageID
+  podman image sign --sign-by mykey --directory ./mykeydir imageID`,
+	}
+)
+
+var (
+	signOptions entities.SignOptions
+)
+
+func init() {
+	registry.Commands = append(registry.Commands, registry.CliCommand{
+		Mode:    []entities.EngineMode{entities.ABIMode},
+		Command: signCommand,
+		Parent:  imageCmd,
+	})
+	flags := signCommand.Flags()
+	flags.StringVarP(&signOptions.Directory, "directory", "d", "", "Define an alternate directory to store signatures")
+	flags.StringVar(&signOptions.SignBy, "sign-by", "", "Name of the signing key")
+	flags.StringVar(&signOptions.CertDir, "cert-dir", "", "`Pathname` of a directory containing TLS certificates and keys")
+}
+
+func sign(cmd *cobra.Command, args []string) error {
+	if signOptions.SignBy == "" {
+		return errors.Errorf("please provide an identity")
+	}
+
+	var sigStoreDir string
+	if len(signOptions.Directory) > 0 {
+		sigStoreDir = signOptions.Directory
+		if _, err := os.Stat(sigStoreDir); err != nil {
+			return errors.Wrapf(err, "invalid directory %s", sigStoreDir)
+		}
+	}
+	_, err := registry.ImageEngine().Sign(registry.Context(), args, signOptions)
+	return err
+}