kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Check if CertsDir is not empty

Browse source 
Signed-off-by: Michal Gebauer <mishak@mishak.net>
This commit is contained in:
Michal Gebauer 2015-11-19 23:30:29 +01:00
parent 9cbfa7b00b
commit bcd0f0cdc4
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
registry/config_unix.go
View file

@ -8,7 +8,9 @@ const (
// DefaultV2Registry is the URI of the default v2 registry // DefaultV2Registry is the URI of the default v2 registry
DefaultV2Registry = "https://registry-1.docker.io" DefaultV2Registry = "https://registry-1.docker.io"
)
var (
// CertsDir is the directory where certificates are stored // CertsDir is the directory where certificates are stored
CertsDir = "/etc/docker/certs.d" CertsDir = "/etc/docker/certs.d"
) )

2
registry/registry.go
View file

@ -62,7 +62,7 @@ func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) {
tlsConfig.InsecureSkipVerify = !isSecure tlsConfig.InsecureSkipVerify = !isSecure
if isSecure { if isSecure && CertsDir != "" {
hostDir := filepath.Join(CertsDir, cleanPath(hostname)) hostDir := filepath.Join(CertsDir, cleanPath(hostname))
logrus.Debugf("hostDir: %s", hostDir) logrus.Debugf("hostDir: %s", hostDir)
if err := ReadCertsDirectory(&tlsConfig, hostDir); err != nil { if err := ReadCertsDirectory(&tlsConfig, hostDir); err != nil {