From 04cbff8d35ff871278bb60f7f85ca2df3eb59f4d Mon Sep 17 00:00:00 2001
From: shin- <joffrey@dotcloud.com>
Date: Wed, 31 Jul 2013 19:03:14 +0200
Subject: [PATCH] registry: Fixed a bug where token and cookie info wouldn't be
 sent when using LookupRemoteImage(). Fixed a bug where no error would be
 reported when getting a non-200 status code in GetRemoteImageLayer()

---
 docs/registry.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/registry.go b/docs/registry.go
index 0d2a64e0..579b34e8 100644
--- a/docs/registry.go
+++ b/docs/registry.go
@@ -147,13 +147,14 @@ func (r *Registry) GetRemoteHistory(imgID, registry string, token []string) ([]s
 
 // Check if an image exists in the Registry
 func (r *Registry) LookupRemoteImage(imgID, registry string, token []string) bool {
-	rt := &http.Transport{Proxy: http.ProxyFromEnvironment}
+
 
 	req, err := r.reqFactory.NewRequest("GET", registry+"images/"+imgID+"/json", nil)
 	if err != nil {
 		return false
 	}
-	res, err := rt.RoundTrip(req)
+	req.Header.Set("Authorization", "Token "+strings.Join(token, ", "))
+	res, err := doWithCookies(r.client, req)
 	if err != nil {
 		return false
 	}
@@ -200,6 +201,10 @@ func (r *Registry) GetRemoteImageLayer(imgID, registry string, token []string) (
 	if err != nil {
 		return nil, err
 	}
+	if res.StatusCode != 200 {
+		return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
+			res.StatusCode, imgID)
+	}
 	return res.Body, nil
 }