Fix #368 and more configuration cleanup

Docker-DCO-1.1-Signed-off-by: Mangled Deutz <[email protected]> (github: dmp42)

Author: Mangled Deutz

docker_registry/app.py

@@ -13,8 +13,8 @@
 import flask
 
 from . import toolkit
-from .lib import __version__
 from .lib import config
+from .server import __version__
 
 app = flask.Flask('docker-registry')
 cfg = config.load()

docker_registry/lib/__init__.py

@@ -1,18 +1 @@
 # -*- coding: utf-8 -*-
-
-__author__ = 'Docker Registry Contributors'
-__copyright__ = '{{driver.copyright}}'
-__credits__ = []
-
-__license__ = 'Apache 2.0'
-__version__ = '0.7.0'
-__maintainer__ = __author__
-__email__ = '[email protected]'
-__status__ = 'Production'
-
-__title__ = 'docker-registry'
-__build__ = 0x000000
-
-__url__ = 'https://github.com/dotcloud/docker-registry'
-__description__ = 'Registry server for Docker'
-__download__ = 'https://github.com/dotcloud/docker-registry/archive/master.zip'

docker_registry/lib/cache.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 import logging
-
 import redis
 
 from docker_registry.core import lru

docker_registry/run.py

@@ -16,6 +16,7 @@
 from .tags import *  # noqa
 from .images import *  # noqa
 from .lib import config
+from .server import env
 from .status import *  # noqa
 from .search import *  # noqa
 
@@ -47,12 +48,13 @@ def run_gunicorn():
                             formatter_class=RawTextHelpFormatter)
     parser.parse_args()
 
-    workers = os.environ.get('GUNICORN_WORKERS', '4')
-    port = os.environ.get('REGISTRY_PORT', '5000')
-    graceful_timeout = os.environ.get('GUNICORN_GRACEFUL_TIMEOUT', '3600')
-    silent_timeout = os.environ.get('GUNICORN_SILENT_TIMEOUT', '3600')
+    workers = env.source('GUNICORN_WORKERS')
+    host = env.source('REGISTRY_HOST')
+    port = env.source('REGISTRY_PORT')
+    graceful_timeout = env.source('GUNICORN_GRACEFUL_TIMEOUT')
+    silent_timeout = env.source('GUNICORN_SILENT_TIMEOUT')
 
-    address = '0.0.0.0:{0}'.format(port)
+    address = '%s:%s' % (host, port)
 
     gunicorn_path = distutils.spawn.find_executable('gunicorn')
     if gunicorn_path is None:

docker_registry/server/__init__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+__author__ = 'Docker Registry Contributors'
+__copyright__ = 'Copyright 2014 Docker'
+__credits__ = []
+
+__license__ = 'Apache 2.0'
+__version__ = '0.7.0'
+__maintainer__ = __author__
+__email__ = '[email protected]'
+__status__ = 'Production'
+
+__title__ = 'docker-registry'
+__build__ = 0x000000
+
+__url__ = 'https://github.com/dotcloud/docker-registry'
+__description__ = 'Registry server for Docker'
+__download__ = 'https://github.com/dotcloud/docker-registry/archive/master.zip'

docker_registry/server/env.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+import os
+
+__all__ = ['source']
+
+defined = {
+    'REGISTRY_PORT': 5000,
+    'REGISTRY_HOST': '0.0.0.0',
+    'SETTINGS_FLAVOR': 'dev',
+    'GUNICORN_WORKERS': 4,
+    'GUNICORN_GRACEFUL_TIMEOUT': 3600,
+    'GUNICORN_SILENT_TIMEOUT': 3600
+}
+
+
+def source(key, override=None):
+    return os.environ.get(key, defined[key] if key in defined else override)

docker_registry/wsgi.py

@@ -2,16 +2,17 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import os
 
 from .run import app
+from .server import env
 
 
 if __name__ == '__main__':
     # Bind to PORT if defined, otherwise default to 5000.
-    port = int(os.environ.get('PORT_WWW', 5000))
+    host = env.source('REGISTRY_HOST')
+    port = int(env.source('REGISTRY_PORT'))
     app.debug = True
-    app.run(host='0.0.0.0', port=port)
+    app.run(host=host, port=port)
     # Or you can run:
     # gunicorn --access-logfile - --log-level debug --debug -b 0.0.0.0:5000 \
     #  -w 1 wsgi:application

setup.py

@@ -10,7 +10,7 @@
 
 # XXX as ugly as this looks, namespaces break terribly otherwise
 # import docker_registry.lib as lib
-execfile('./docker_registry/lib/__init__.py')
+execfile('./docker_registry/server/__init__.py')
 
 requirements_txt = open('./requirements.txt')
 requirements = [line for line in requirements_txt]
@@ -31,6 +31,7 @@
 # Explicit packages list to avoid setup_tools funkyness
 packages = ['docker_registry',
             'docker_registry.drivers',
+            'docker_registry.server',
             'docker_registry.lib',
             'docker_registry.storage',
             'docker_registry.lib.index']