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

config: fix error message using incorrect filename 

Before:

    echo 'invalid-json' > ~/.dockercfg
    docker pull hello-world
    WARNING: Error loading config file: /root/.docker/config.json: Invalid Auth config file

After:

    echo 'invalid-json' > ~/.dockercfg
    docker pull hello-world
    WARNING: Error loading config file: /root/.dockercfg: Invalid Auth config file

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-06-12 22:12:29 +02:00
parent af2c31c4a7
commit 494f30a1a5
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/config/config.go
View File

@ -117,11 +117,11 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
if err != nil {
return configFile, errors.Wrap(err, oldConfigfile)
}
confFile := filepath.Join(homedir, oldConfigfile)
if _, err := os.Stat(confFile); err != nil {
filename = filepath.Join(homedir, oldConfigfile)
if _, err := os.Stat(filename); err != nil {
return configFile, nil // missing file is not an error
}
file, err := os.Open(confFile)
file, err := os.Open(filename)
if err != nil {
return configFile, errors.Wrap(err, filename)
}