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

Merge pull request #1541 from dotcloud/1528-fix_panic 

prevent crash when .dockercfg not readable
This commit is contained in:
Guillaume J. Charmes 2013-08-14 14:51:01 -07:00
parent 8dfc47307d 3c9f9945c9
commit 5ad8840024
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auth/auth.go
View File

@ -80,7 +80,7 @@ func LoadConfig(rootPath string) (*ConfigFile, error) {
} }
b, err := ioutil.ReadFile(confFile) b, err := ioutil.ReadFile(confFile)
if err != nil { if err != nil {
return nil, err return &configFile, err
} }
if err := json.Unmarshal(b, &configFile.Configs); err != nil { if err := json.Unmarshal(b, &configFile.Configs); err != nil {

5
commands.go
View File

@ -1751,7 +1751,10 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string) *Doc
err = out err = out
} }
configFile, _ := auth.LoadConfig(os.Getenv("HOME")) configFile, e := auth.LoadConfig(os.Getenv("HOME"))
if e != nil {
fmt.Fprintf(err, "WARNING: %s\n", e)
}
return &DockerCli{ return &DockerCli{
proto: proto, proto: proto,
addr: addr, addr: addr,