Merge pull request #387 from dotcloud/mirroring_fixes

Mirroring fixes

Author: dmp42

docker_registry/index.py

@@ -11,7 +11,6 @@
 
 from . import storage
 from . import toolkit
-from .lib import config
 from .lib import mirroring
 from .lib import signals
 
@@ -28,18 +27,8 @@
 """
 
 
-def get_endpoints(cfg=None):
-    if not cfg:
-        cfg = config.load()
-    registry_endpoints = cfg.registry_endpoints
-    if not registry_endpoints:
-        #registry_endpoints = socket.gethostname()
-        registry_endpoints = flask.request.environ['HTTP_HOST']
-    return registry_endpoints
-
-
 def generate_headers(namespace, repository, access):
-    registry_endpoints = get_endpoints()
+    registry_endpoints = toolkit.get_endpoints()
     # The token generated will be invalid against a real Index behind.
     token = 'Token signature={0},repository="{1}/{2}",access={3}'.format(
             toolkit.gen_random_string(), namespace, repository, access)

docker_registry/lib/mirroring.py

@@ -78,8 +78,13 @@ def wrapper(namespace, repository, *args, **kwargs):
             )
             if not source_resp:
                 return resp
-            return toolkit.response(data=source_resp.content,
-                                    headers=source_resp.headers, raw=True)
+
+            headers = source_resp.headers
+            if 'Content-Encoding' in headers:
+                del headers['Content-Encoding']
+
+            return toolkit.response(data=source_resp.content, headers=headers,
+                                    raw=True)
 
         store = storage.load()
         request_path = flask.request.path
@@ -102,10 +107,14 @@ def wrapper(namespace, repository, *args, **kwargs):
         if not source_resp:
             return resp
         data = source_resp.content
+        headers = source_resp.headers
+        if 'Content-Encoding' in headers:
+                del headers['Content-Encoding']
+
         cache.redis_conn.setex('{0}:{1}'.format(
             cache.cache_prefix, tag_path
         ), tags_cache_ttl, data)
-        return toolkit.response(data=data, headers=source_resp.headers,
+        return toolkit.response(data=data, headers=headers,
                                 raw=True)
     return wrapper
 
@@ -138,6 +147,8 @@ def wrapper(*args, **kwargs):
             headers = source_resp.headers
             if 'Content-Encoding' in headers:
                 del headers['Content-Encoding']
+            if index_route and 'X-Docker-Endpoints' in headers:
+                headers['X-Docker-Endpoints'] = toolkit.get_endpoints()
 
             if not stream:
                 logger.debug('JSON data found on source, writing response')

docker_registry/toolkit.py

@@ -303,3 +303,13 @@ def get_repository():
     if len(parts) < 2:
         return ('library', parts[0])
     return (parts[0], parts[1])
+
+
+def get_endpoints(cfg=None):
+    if not cfg:
+        cfg = config.load()
+    registry_endpoints = cfg.registry_endpoints
+    if not registry_endpoints:
+        #registry_endpoints = socket.gethostname()
+        registry_endpoints = flask.request.environ['HTTP_HOST']
+    return registry_endpoints