prevent crash when .dockercfg not readable

fourk · Aug 14, 2013 · 3c9f994 · 3c9f994
1 parent 4cb57a5
commit 3c9f994
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/auth/auth.go b/auth/auth.go
@@ -80,7 +80,7 @@ func LoadConfig(rootPath string) (*ConfigFile, error) {
 	}
 	b, err := ioutil.ReadFile(confFile)
 	if err != nil {
-		return nil, err
+		return &configFile, err
 	}
 
 	if err := json.Unmarshal(b, &configFile.Configs); err != nil {

diff --git a/commands.go b/commands.go
@@ -1751,7 +1751,10 @@ func NewDockerCli(in io.ReadCloser, out, err io.Writer, proto, addr string) *Doc
 		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{
 		proto:      proto,
 		addr:       addr,