Merge pull request #751 from dotcloud/660-auth_client-feature

* Registry: Move auth to the client
This commit is contained in:
Guillaume J. Charmes 2013-06-13 11:52:40 -07:00
commit 7c76c4689d

View File

@ -473,10 +473,7 @@ type Registry struct {
authConfig *auth.AuthConfig authConfig *auth.AuthConfig
} }
func NewRegistry(root string) *Registry { func NewRegistry(root string, authConfig *auth.AuthConfig) *Registry {
// If the auth file does not exist, keep going
authConfig, _ := auth.LoadConfig(root)
httpTransport := &http.Transport{ httpTransport := &http.Transport{
DisableKeepAlives: true, DisableKeepAlives: true,
Proxy: http.ProxyFromEnvironment, Proxy: http.ProxyFromEnvironment,