mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-11 13:02:14 +00:00
Merge pull request #1687 from erictune/fix_dockercfg
Handle and log errors when reading .dockercfg
This commit is contained in:
commit
0f1455ac71
@ -22,6 +22,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/fsouza/go-dockerclient"
|
"github.com/fsouza/go-dockerclient"
|
||||||
@ -33,8 +34,21 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func readDockerConfigFile() (cfg dockerConfig, err error) {
|
func readDockerConfigFile() (cfg dockerConfig, err error) {
|
||||||
contents, err := ioutil.ReadFile(dockerConfigFileLocation)
|
absDockerConfigFileLocation, err := filepath.Abs(dockerConfigFileLocation)
|
||||||
err = json.Unmarshal(contents, &cfg)
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user