[fix-hyper-vendor] update hypercli in vendor

This commit is contained in:
Jimmy Xu
2018-01-05 12:32:03 +00:00
committed by Robbie Zhang
parent e050fea889
commit 0e123c783b
21 changed files with 726 additions and 3 deletions

6
vendor/github.com/hyperhq/hypercli/api/client/trust.go generated vendored Normal file → Executable file
View File

@@ -114,7 +114,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut
return nil, err
}
var cfg = tlsconfig.ClientDefault
var cfg = tlsconfig.ClientDefault()
cfg.InsecureSkipVerify = !repoInfo.Index.Secure
// Get certificate base directory
@@ -124,7 +124,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut
}
logrus.Debugf("reading certificate directory: %s", certDir)
if err := registry.ReadCertsDirectory(&cfg, certDir); err != nil {
if err := registry.ReadCertsDirectory(cfg, certDir); err != nil {
return nil, err
}
@@ -136,7 +136,7 @@ func (cli *DockerCli) getNotaryRepository(repoInfo *registry.RepositoryInfo, aut
DualStack: true,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
TLSClientConfig: &cfg,
TLSClientConfig: cfg,
DisableKeepAlives: true,
}