diff options
author | Tonis Tiigi <tonistiigi@gmail.com> | 2020-04-13 20:31:26 -0700 |
---|---|---|
committer | Tonis Tiigi <tonistiigi@gmail.com> | 2020-04-14 08:26:07 -0700 |
commit | 0cdf6ba9c8309b06ee76c3fc3fe38d51fe541ffe (patch) | |
tree | 102e285bdfd7e8c721b68aeff10837f5106eea31 /registry/registry.go | |
parent | e6d949b9e707c55700c545614d25713bb191aed8 (diff) | |
download | docker-0cdf6ba9c8309b06ee76c3fc3fe38d51fe541ffe.tar.gz |
vendor: update buildkit to ae7ff174
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Diffstat (limited to 'registry/registry.go')
-rw-r--r-- | registry/registry.go | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/registry/registry.go b/registry/registry.go index 4c82a61cb3..05072417be 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -26,6 +26,24 @@ var ( ErrAlreadyExists = errors.New("Image already exists") ) +// HostCertsDir returns the config directory for a specific host +func HostCertsDir(hostname string) (string, error) { + certsDir := CertsDir + + if rootless.RunningWithRootlessKit() { + configHome, err := homedir.GetConfigHome() + if err != nil { + return "", err + } + + certsDir = filepath.Join(configHome, "docker/certs.d") + } + + hostDir := filepath.Join(certsDir, cleanPath(hostname)) + + return hostDir, nil +} + func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) { // PreferredServerCipherSuites should have no effect tlsConfig := tlsconfig.ServerDefault() @@ -33,19 +51,11 @@ func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) { tlsConfig.InsecureSkipVerify = !isSecure if isSecure && CertsDir != "" { - certsDir := CertsDir - - if rootless.RunningWithRootlessKit() { - configHome, err := homedir.GetConfigHome() - if err != nil { - return nil, err - } - - certsDir = filepath.Join(configHome, "docker/certs.d") + hostDir, err := HostCertsDir(hostname) + if err != nil { + return nil, err } - hostDir := filepath.Join(certsDir, cleanPath(hostname)) - logrus.Debugf("hostDir: %s", hostDir) if err := ReadCertsDirectory(tlsConfig, hostDir); err != nil { return nil, err |