8000 [19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) by AkihiroSuda · Pull Request #40461 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

[19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) #40461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2020
Merged

[19.03 backport] Use certs.d from XDG_CONFIG_HOME when in rootless mode (fixes #40236) #40461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ import (
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
"github.com/sirupsen/logrus"

"github.com/docker/docker/pkg/homedir"
"github.com/docker/docker/rootless"
)

var (
Expand All @@ -32,7 +35,19 @@ func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) {
tlsConfig.InsecureSkipVerify = !isSecure

if isSecure && CertsDir != "" {
hostDir := filepath.Join(CertsDir, cleanPath(hostname))
certsDir := CertsDir

if rootless.RunningWithRootlessKit() {
configHome, err := homedir.GetConfigHome()
if err != nil {
return nil, err
}

certsDir = filepath.Join(configHome, "docker/certs.d")
}

hostDir := filepath.Join(certsDir, cleanPath(hostname))

logrus.Debugf("hostDir: %s", hostDir)
if err := ReadCertsDirectory(tlsConfig, hostDir); err != nil {
return nil, err
Expand Down
0