FailedChanges

Summary

  1. resolve merge conflict (commit: 4fe6455) (details)
Commit 4fe6455e6a8797796d3ef7e3087e2f2971a39219 by li.guangxu
resolve merge conflict
use upstream public func to get docker config
recover func GetDockercfgFile
revert function
add search paths printing
gofmt
rebase
fix inaccurate word
(commit: 4fe6455)
The file was modifiedpkg/build/builder/cmd/dockercfg/cfg_test.go (diff)
The file was modifiedpkg/build/builder/docker.go (diff)
The file was modifiedpkg/build/builder/cmd/dockercfg/cfg.go (diff)