p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix panic with wrong dockercfg file

Browse Source 
Upstream-commit: 649605915428e0ee81cf49d15e949d48da20110c
Component: engine
This commit is contained in:
Victor Vieux
2013-09-30 11:07:32 +00:00
parent 4664dde409
commit bc13d7f295
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/auth/auth.go
View File

@ -91,11 +91,17 @@ func LoadConfig(rootPath string) (*ConfigFile, error) {
}
authConfig := AuthConfig{}
origAuth := strings.Split(arr[0], " = ")
if len(origAuth) != 2 {
return &configFile, fmt.Errorf("Invalid Auth config file")
}
authConfig.Username, authConfig.Password, err = decodeAuth(origAuth[1])
if err != nil {
return &configFile, err
}
origEmail := strings.Split(arr[1], " = ")
if len(origEmail) != 2 {
return &configFile, fmt.Errorf("Invalid Auth config file")
}
authConfig.Email = origEmail[1]
authConfig.ServerAddress = IndexServerAddress()
configFile.Configs[IndexServerAddress()] = authConfig