Fix #377 && Fix #376

Bugsnag is now an "extra".
Metadata are now stored centrally in server/__init__.py and no longer duplicated across the codebase.

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

Author: Mangled Deutz

Dockerfile

@@ -25,7 +25,7 @@ add ./config/boto.cfg /etc/boto.cfg
 run pip install /docker-registry/depends/docker-registry-core
 
 # Install registry
-run pip install /docker-registry/
+run pip install file:///docker-registry#egg=docker-registry[bugsnag]
 
 env DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
 env SETTINGS_FLAVOR dev

README.md

@@ -158,7 +158,7 @@ When using the `config_sample.yml`, you can pass all options through as environm
    *non*-Amazon S3-compliant object store, in one of the boto config files'
    `[Credentials]` section, set `boto_host`, `boto_port` as appropriate for the
    service you are using.
-1. `bugsnag`: The bugsnag API key
+1. `bugsnag`: The bugsnag API key (note that if you don't use the official docker container, you need to install the registry with bugsnag enabled: `pip install docker-registry[bugsnag]`)
 
 ### Authentication options
 
@@ -405,6 +405,13 @@ Then install the Registry app:
 sudo pip install docker-registry
 ```
 
+If you need extra requirements, like bugsnag, specify them:
+
+```
+sudo pip install docker-registry[bugsnag]
+```
+
+
 (or clone the repository and `pip install .`)
 
 #### On Red Hat-based systems:
@@ -421,7 +428,7 @@ should not require the additional repositories.
 Then install the Registry app:
 
 ```
-sudo python-pip install docker-registry
+sudo python-pip install docker-registry[bugsnag]
 ```
 
 (or clone the repository and `pip install .`)

build.sh

@@ -7,7 +7,7 @@ cd $SERVICE_APPROOT
 . ~/env/bin/activate
 
 pip install --download-cache=~/.pip-cache ./depends/docker-registry-core || exit 1
-pip install --download-cache=~/.pip-cache . || exit 1
+pip install --download-cache=~/.pip-cache file://`pwd`#egg=docker-registry[bugsnag] || exit 1
 
 cp -R * ~/
 

docker_registry/app.py

@@ -14,8 +14,8 @@
 
 from . import toolkit
 from .lib import config
+from .server import __version__
 
-VERSION = '0.7.0'
 app = flask.Flask('docker-registry')
 cfg = config.load()
 loglevel = getattr(logging, cfg.get('loglevel', 'INFO').upper())
@@ -35,12 +35,12 @@ def ping():
 @app.route('/')
 def root():
     return toolkit.response('docker-registry server ({0}) (v{1})'
-                            .format(cfg.flavor, VERSION))
+                            .format(cfg.flavor, __version__))
 
 
 @app.after_request
 def after_request(response):
-    response.headers['X-Docker-Registry-Version'] = VERSION
+    response.headers['X-Docker-Registry-Version'] = __version__
     response.headers['X-Docker-Registry-Config'] = cfg.flavor
     return response
 
@@ -76,7 +76,7 @@ def init():
                           project_root=root_path,
                           release_stage=cfg.flavor,
                           notify_release_stages=[cfg.flavor],
-                          app_version=VERSION
+                          app_version=__version__
                           )
         bugsnag.flask.handle_exceptions(app)
 

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'

setup.py

@@ -8,7 +8,10 @@
 
 import sys
 
-requirements_txt = open('./requirements.txt')
+# XXX as ugly as this looks, namespaces break terribly otherwise
+# import docker_registry.lib as lib
+execfile('./docker_registry/server/__init__.py')
+
 requirements_txt = open('./requirements/main.txt')
 requirements = [line for line in requirements_txt]
 
@@ -33,34 +36,49 @@
             'docker_registry.storage',
             'docker_registry.lib.index']
 
+namespaces = ['docker_registry', 'docker_registry.drivers']
+
+package_data = {'docker_registry': ['../config/*']}
+
+
 setuptools.setup(
-    name='docker-registry',
-    # TODO: Load the version programatically, which is currently available in
-    #       docker_registry.app. This is not possible yet because importing
-    #       causes config files to be loaded
-    version='0.7.0',
-    description='Registry server for Docker',
-    long_description=open('README.md').read(),
-    namespace_packages=['docker_registry', 'docker_registry.drivers'],
+    name=__title__,  # noqa
+    version=__version__,  # noqa
+    author=__author__,  # noqa
+    author_email=__email__,  # noqa
+    maintainer=__maintainer__,  # noqa
+    maintainer_email=__email__,  # noqa
+    url=__url__,  # noqa
+    description=__description__,  # noqa
+    download_url=__download__,  # noqa
+    long_description=open('./README.md').read(),
+    namespace_packages=namespaces,
     packages=packages,
-    license=open('LICENSE').read(),
-    author='Docker Registry Contributors',
-    author_email='[email protected]',
-    url='https://github.com/dotcloud/docker-registry',
-    install_requires=requirements,
-    classifiers=(
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-    ),
-    platforms=['Independent'],
-    package_data={'docker_registry': ['../config/*']},
+    package_data=package_data,
     entry_points={
         'console_scripts': [
             'docker-registry = docker_registry.run:run_gunicorn'
         ]
     },
+
+    classifiers=['Development Status :: 4 - Beta',
+                 'Intended Audience :: Developers',
+                 # 'Programming Language :: Python :: 2.6',
+                 'Programming Language :: Python :: 2.7',
+                 # 'Programming Language :: Python :: 3.2',
+                 # 'Programming Language :: Python :: 3.3',
+                 # 'Programming Language :: Python :: 3.4',
+                 'Programming Language :: Python :: Implementation :: CPython',
+                 'Operating System :: OS Independent',
+                 'Topic :: Utilities',
+                 'License :: OSI Approved :: Apache Software License'],
+    platforms=['Independent'],
+    license=open('./LICENSE').read(),
     zip_safe=False,
-    tests_require=open('./tests/requirements.txt').read(),
-    test_suite='nose.collector'
+    test_suite='nose.collector',
+    install_requires=requirements,
+    tests_require=open('./requirements/test.txt').read(),
+    extras_require={
+        'bugsnag': ['bugsnag==2.0.1']
+    }
 )