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

Merge pull request #2111 from tiborvass/revert-homedir 

config: revert to using pkg/homedir
This commit is contained in:
Sebastiaan van Stijn 2019-10-15 11:58:32 +02:00 committed by GitHub
parent 5d85cdacd2 7a279af43d
commit 4ce0640a09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/config/config.go
View File

@ -10,6 +10,7 @@ import (
"github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/configfile"
"github.com/docker/cli/cli/config/credentials" "github.com/docker/cli/cli/config/credentials"
"github.com/docker/cli/cli/config/types" "github.com/docker/cli/cli/config/types"
"github.com/docker/docker/pkg/homedir"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -27,10 +28,7 @@ var (
func init() { func init() {
if configDir == "" { if configDir == "" {
homedir, err := os.UserHomeDir() configDir = filepath.Join(homedir.Get(), configFileDir)
if err == nil {
configDir = filepath.Join(homedir, configFileDir)
}
} }
} }