fcrozat/distribution
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18105 from mishak87/registry-improvements

Browse Source 
Registry tiny code improvements
This commit is contained in:
Tibor Vass 2015-12-07 13:35:02 +01:00
commit 3e88c525eb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/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
docs/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 {