Merge pull request #6716 from jwhonce/issues/6598

Fixes --remote flag issues

4 files changed, 12 insertions, 13 deletions

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index dfde896a1..eefc488d3 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -40,12 +40,11 @@ var (
 	// Command: podman _diff_ Object_ID
 	buildDescription = "Builds an OCI or Docker image using instructions from one or more Containerfiles and a specified build context directory."
 	buildCmd         = &cobra.Command{
-		Use:              "build [flags] [CONTEXT]",
-		Short:            "Build an image using instructions from Containerfiles",
-		Long:             buildDescription,
-		TraverseChildren: true,
-		RunE:             build,
-		Args:             cobra.MaximumNArgs(1),
+		Use:   "build [flags] [CONTEXT]",
+		Short: "Build an image using instructions from Containerfiles",
+		Long:  buildDescription,
+		Args:  cobra.MaximumNArgs(1),
+		RunE:  build,
 		Example: `podman build .
   podman build --creds=username:password -t imageName -f Containerfile.simple .
   podman build --layers --force-rm --tag imageName .`,
diff --git a/cmd/podman/images/diff.go b/cmd/podman/images/diff.go
index c24f98369..53165543c 100644
--- a/cmd/podman/images/diff.go
+++ b/cmd/podman/images/diff.go
@@ -14,8 +14,8 @@ var (
 	diffCmd = &cobra.Command{
 		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.`,
+		Short: "Inspect changes to the image's file systems",
+		Long:  `Displays changes to the image's filesystem.  The image will be compared to its parent layer.`,
 		RunE:  diff,
 		Example: `podman image diff myImage
   podman image diff --format json redis:alpine`,
diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go
index ebef126c0..2d1974d5c 100644
--- a/cmd/podman/images/image.go
+++ b/cmd/podman/images/image.go
@@ -13,11 +13,10 @@ var (
 
 	// Command: podman _image_
 	imageCmd = &cobra.Command{
-		Use:              "image",
-		Short:            "Manage images",
-		Long:             "Manage images",
-		TraverseChildren: true,
-		RunE:             validate.SubCommandExists,
+		Use:   "image",
+		Short: "Manage images",
+		Long:  "Manage images",
+		RunE:  validate.SubCommandExists,
 	}
 )
 
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index ccac7e3fe..d7756433b 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -86,6 +86,7 @@ func searchFlags(flags *pflag.FlagSet) {
 	flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output")
 	flags.StringVar(&searchOptions.Authfile, "authfile", auth.GetDefaultAuthFile(), "Path of the authentication file. Use REGISTRY_AUTH_FILE environment variable to override")
 	flags.BoolVar(&searchOptions.TLSVerifyCLI, "tls-verify", true, "Require HTTPS and verify certificates when contacting registries")
+
 	if registry.IsRemote() {
 		_ = flags.MarkHidden("authfile")
 		_ = flags.MarkHidden("tls-verify")