github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1687 from erictune/fix_dockercfg 

Handle and log errors when reading .dockercfg
pull/6/head
Dawn Chen 2014-10-09 14:00:24 -07:00
parent 5514ea8bbe 4e0a72734e
commit 0f1455ac71
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/dockertools/config.go
View File

@ -22,6 +22,7 @@ import (
"fmt"
"io/ioutil"
"net/url"
"path/filepath"
"strings"
"github.com/fsouza/go-dockerclient"
@ -33,8 +34,21 @@ const (
)
func readDockerConfigFile() (cfg dockerConfig, err error) {
contents, err := ioutil.ReadFile(dockerConfigFileLocation)
err = json.Unmarshal(contents, &cfg)
absDockerConfigFileLocation, err := filepath.Abs(dockerConfigFileLocation)
if err != nil {
glog.Errorf("while trying to canonicalize %s: %v", dockerConfigFileLocation, err)
}
absDockerConfigFileLocation, err = filepath.Abs(dockerConfigFileLocation)
glog.V(2).Infof("looking for .dockercfg at %s", absDockerConfigFileLocation)
contents, err := ioutil.ReadFile(absDockerConfigFileLocation)
if err != nil {
glog.Errorf("while trying to read %s: %v", absDockerConfigFileLocation, err)
return nil, err
}
if err = json.Unmarshal(contents, &cfg); err != nil {
glog.Errorf("while trying to parse %s: %v", absDockerConfigFileLocation, err)
return nil, err
}
return
}