From 1d93d212541616135da23bcf01ca49180f113e62 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Wed, 15 Apr 2020 10:12:30 -0700
Subject: V2 Enable rootless

* Enable running podman V2 rootless
* Fixed cobra.PersistentPreRunE usage in all the commands
* Leveraged cobra.PersistentPreRunE/cobra.PersistentPostRunE to manage:
  * rootless
  * trace (--trace)
  * profiling (--cpu-profile)
  * initializing the registry copies of Image/Container engines
* Help and Usage templates autoset for all sub-commands

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 cmd/podmanV2/images/search.go | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'cmd/podmanV2/images/search.go')

diff --git a/cmd/podmanV2/images/search.go b/cmd/podmanV2/images/search.go
index 2ab9735ec..17c72784c 100644
--- a/cmd/podmanV2/images/search.go
+++ b/cmd/podmanV2/images/search.go
@@ -32,12 +32,14 @@ var (
 
 	// Command: podman search
 	searchCmd = &cobra.Command{
-		Use:     "search [flags] TERM",
-		Short:   "Search registry for image",
-		Long:    searchDescription,
-		PreRunE: preRunE,
-		RunE:    imageSearch,
-		Args:    cobra.ExactArgs(1),
+		Use:   "search [flags] TERM",
+		Short: "Search registry for image",
+		Long:  searchDescription,
+		RunE:  imageSearch,
+		Args:  cobra.ExactArgs(1),
+		Annotations: map[string]string{
+			registry.ParentNSRequired: "",
+		},
 		Example: `podman search --filter=is-official --limit 3 alpine
   podman search registry.fedoraproject.org/  # only works with v2 registries
   podman search --format "table {{.Index}} {{.Name}}" registry.fedoraproject.org/fedora`,
@@ -45,12 +47,11 @@ var (
 
 	// Command: podman image search
 	imageSearchCmd = &cobra.Command{
-		Use:     searchCmd.Use,
-		Short:   searchCmd.Short,
-		Long:    searchCmd.Long,
-		PreRunE: searchCmd.PreRunE,
-		RunE:    searchCmd.RunE,
-		Args:    searchCmd.Args,
+		Use:   searchCmd.Use,
+		Short: searchCmd.Short,
+		Long:  searchCmd.Long,
+		RunE:  searchCmd.RunE,
+		Args:  searchCmd.Args,
 		Example: `podman image search --filter=is-official --limit 3 alpine
 		podman image search registry.fedoraproject.org/  # only works with v2 registries
 		podman image search --format "table {{.Index}} {{.Name}}" registry.fedoraproject.org/fedora`,
@@ -64,8 +65,6 @@ func init() {
 		Command: searchCmd,
 	})
 
-	searchCmd.SetHelpTemplate(registry.HelpTemplate())
-	searchCmd.SetUsageTemplate(registry.UsageTemplate())
 	flags := searchCmd.Flags()
 	searchFlags(flags)
 
-- 
cgit v1.2.3-54-g00ecf