Merge pull request moby#14046 from mattmoor/token-investigation

Unconditionally use AuthTransport.
pospispa · Jun 26, 2015 · c7ece73 · c7ece73
2 parents dd40889 + c231510
commit c7ece73
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/registry/session.go b/registry/session.go
@@ -158,9 +158,9 @@ func NewSession(client *http.Client, authConfig *cliconfig.AuthConfig, endpoint
 		}
 	}
 
-	if endpoint.Version == APIVersion1 {
-		client.Transport = AuthTransport(client.Transport, authConfig, alwaysSetBasicAuth)
-	}
+	// Annotate the transport unconditionally so that v2 can
+	// properly fallback on v1 when an image is not found.
+	client.Transport = AuthTransport(client.Transport, authConfig, alwaysSetBasicAuth)
 
 	jar, err := cookiejar.New(nil)
 	if err != nil {