Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Remove unused trust key
This commit is contained in:
Daniel Nephin 2017-05-08 15:16:24 -04:00 committed by GitHub
parent 5a4873c21a 515d0fd842
commit d9fde418c0
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/command/cli.go
View File

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

3
cli/flags/common.go
View File

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