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

Merge pull request #238 from vdemeester/update-go-connections 

Update go-connections dependency
This commit is contained in:
Vincent Demeester 2017-06-29 18:04:27 +02:00 committed by GitHub
parent 64486d7820 9f34e340b3
commit 8de604c857
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -10,7 +10,7 @@ github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621
github.com/docker/docker 050c1bb17bd033e909cb653f5449b683608293d6 github.com/docker/docker 050c1bb17bd033e909cb653f5449b683608293d6
github.com/docker/docker-credential-helpers v0.5.1 github.com/docker/docker-credential-helpers v0.5.1
github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 #? github.com/docker/go d30aec9fd63c35133f8f79c3412ad91a3b08be06 #?
github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5 github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894 github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1 github.com/docker/go-units 9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1
github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a

3
vendor/github.com/docker/go-connections/tlsconfig/certpool_go17.go generated vendored
View File

@ -5,8 +5,6 @@ package tlsconfig
import ( import (
"crypto/x509" "crypto/x509"
"runtime" "runtime"
"github.com/Sirupsen/logrus"
) )
// SystemCertPool returns a copy of the system cert pool, // SystemCertPool returns a copy of the system cert pool,
@ -14,7 +12,6 @@ import (
func SystemCertPool() (*x509.CertPool, error) { func SystemCertPool() (*x509.CertPool, error) {
certpool, err := x509.SystemCertPool() certpool, err := x509.SystemCertPool()
if err != nil && runtime.GOOS == "windows" { if err != nil && runtime.GOOS == "windows" {
logrus.Infof("Unable to use system certificate pool: %v", err)
return x509.NewCertPool(), nil return x509.NewCertPool(), nil
} }
return certpool, err return certpool, err

2
vendor/github.com/docker/go-connections/tlsconfig/certpool_other.go generated vendored
View File

@ -5,12 +5,10 @@ package tlsconfig
import ( import (
"crypto/x509" "crypto/x509"
"github.com/Sirupsen/logrus"
) )
// SystemCertPool returns an new empty cert pool, // SystemCertPool returns an new empty cert pool,
// accessing system cert pool is supported in go 1.7 // accessing system cert pool is supported in go 1.7
func SystemCertPool() (*x509.CertPool, error) { func SystemCertPool() (*x509.CertPool, error) {
logrus.Warn("Unable to use system certificate pool: requires building with go 1.7 or later")
return x509.NewCertPool(), nil return x509.NewCertPool(), nil
} }

2
vendor/github.com/docker/go-connections/tlsconfig/config.go generated vendored
View File

@ -13,7 +13,6 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/Sirupsen/logrus"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -106,7 +105,6 @@ func certPool(caFile string, exclusivePool bool) (*x509.CertPool, error) {
if !certPool.AppendCertsFromPEM(pem) { if !certPool.AppendCertsFromPEM(pem) {
return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile) return nil, fmt.Errorf("failed to append certificates from PEM file: %q", caFile)
} }
logrus.Debugf("Trusting %d certs", len(certPool.Subjects()))
return certPool, nil return certPool, nil
} }