From 10c293d7a95c86adc9f4a5bbd882845ed2333a52 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Wed, 11 Sep 2019 16:02:35 -0400
Subject: podman-remote image trust is broken

We should not be making it available, it does nothing.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 cmd/podman/cliconfig/config.go |  4 ++++
 cmd/podman/commands.go         |  1 +
 cmd/podman/trust.go            | 16 +++++++---------
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'cmd/podman')

diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index 812cc1f51..bf88e853b 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -518,6 +518,10 @@ type SearchValues struct {
 	TlsVerify bool
 }
 
+type TrustValues struct {
+	PodmanCommand
+}
+
 type SignValues struct {
 	PodmanCommand
 	Directory string
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 77c76d1b7..31f1b3ba4 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -33,6 +33,7 @@ func getMainCommands() []*cobra.Command {
 func getImageSubCommands() []*cobra.Command {
 	return []*cobra.Command{
 		_signCommand,
+		_trustCommand,
 	}
 }
 
diff --git a/cmd/podman/trust.go b/cmd/podman/trust.go
index 0a79e1570..f13af96bc 100644
--- a/cmd/podman/trust.go
+++ b/cmd/podman/trust.go
@@ -6,22 +6,20 @@ import (
 )
 
 var (
+	trustCommand     cliconfig.TrustValues
 	trustDescription = `Manages which registries you trust as a source of container images based on its location.
-
   The location is determined by the transport and the registry host of the image.  Using this container image docker://docker.io/library/busybox as an example, docker is the transport and docker.io is the registry host.`
-	trustCommand = cliconfig.PodmanCommand{
-		Command: &cobra.Command{
-			Use:   "trust",
-			Short: "Manage container image trust policy",
-			Long:  trustDescription,
-			RunE:  commandRunE(),
-		},
+	_trustCommand = &cobra.Command{
+		Use:   "trust",
+		Short: "Manage container image trust policy",
+		Long:  trustDescription,
+		RunE:  commandRunE(),
 	}
 )
 
 func init() {
+	trustCommand.Command = _trustCommand
 	trustCommand.SetHelpTemplate(HelpTemplate())
 	trustCommand.SetUsageTemplate(UsageTemplate())
 	trustCommand.AddCommand(getTrustSubCommands()...)
-	imageCommand.AddCommand(trustCommand.Command)
 }
-- 
cgit v1.2.3-54-g00ecf