Merge pull request #28 from dmcgowan/remove-trust-key

Remove unused trust key

cli/command/cli.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"path/filepath"
 	"runtime"
 
 	cliconfig "github.com/docker/cli/cli/config"
@@ -51,7 +50,6 @@ type DockerCli struct {
 	in             *InStream
 	out            *OutStream
 	err            io.Writer
-	keyFile        string
 	client         client.APIClient
 	defaultVersion string
 	server         ServerInfo
@@ -187,12 +185,6 @@ func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions) error {
 
 	cli.defaultVersion = cli.client.ClientVersion()
 
-	if opts.Common.TrustKey == "" {
-		cli.keyFile = filepath.Join(cliconfig.Dir(), cliflags.DefaultTrustKeyFile)
-	} else {
-		cli.keyFile = opts.Common.TrustKey
-	}
-
 	if ping, err := cli.client.Ping(context.Background()); err == nil {
 		cli.server = ServerInfo{
 			HasExperimental: ping.Experimental,

cli/flags/common.go

@@ -13,8 +13,6 @@ import (
 )
 
 const (
-	// DefaultTrustKeyFile is the default filename for the trust key
-	DefaultTrustKeyFile = "key.json"
 	// DefaultCaFile is the default filename for the CA pem file
 	DefaultCaFile = "ca.pem"
 	// DefaultKeyFile is the default filename for the key pem file
@@ -38,7 +36,6 @@ type CommonOptions struct {
 	TLS        bool
 	TLSVerify  bool
 	TLSOptions *tlsconfig.Options
-	TrustKey   string
 }
 
 // NewCommonOptions returns a new CommonOptions