Fixed endpoints list in response headers for standalone mirrors

Author: shin-

docker_registry/index.py

@@ -22,19 +22,8 @@
    entities. This module mimics the Index.
 """
 
-
-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

@@ -136,6 +136,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

@@ -302,3 +302,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