Merge pull request #14046 from mattmoor/token-investigation

Unconditionally use AuthTransport.
This commit is contained in:
Stephen Day 2015-06-25 19:07:10 -07:00
commit 4cbdef4cee

View file

@ -158,9 +158,9 @@ func NewSession(client *http.Client, authConfig *cliconfig.AuthConfig, endpoint
} }
} }
if endpoint.Version == APIVersion1 { // Annotate the transport unconditionally so that v2 can
client.Transport = AuthTransport(client.Transport, authConfig, alwaysSetBasicAuth) // properly fallback on v1 when an image is not found.
} client.Transport = AuthTransport(client.Transport, authConfig, alwaysSetBasicAuth)
jar, err := cookiejar.New(nil) jar, err := cookiejar.New(nil)
if err != nil { if err != nil {