Merge branch 'python-packaging' of github.com:mhrivnak/docker-registry into mhrivnak-python-packaging

Conflicts:
	docker_registry/app.py
	docker_registry/images.py
	registry/__init__.py
	run.sh
	test/base.py

Author: shin-

.travis.yml

@@ -1,7 +1,9 @@
 language: python
 python:
   - "2.7"
-install: pip install tox
+install:
+  - pip install tox
+  - pip install .
 script: tox
 before_install:
   - sudo apt-get update

Dockerfile

@@ -15,14 +15,13 @@ RUN cd /tmp; wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.p
 RUN cd /tmp; python ez_setup.py; easy_install pip; \
     rm ez_setup.py
 
-ADD requirements.txt /docker-registry/
-RUN cd /docker-registry && pip install -r requirements.txt
-
 ADD . /docker-registry
 ADD ./config/boto.cfg /etc/boto.cfg
 
-RUN cp --no-clobber /docker-registry/config/config_sample.yml /docker-registry/config/config.yml
+RUN pip install /docker-registry/
+
+ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
 
 EXPOSE 5000
 
-CMD cd /docker-registry && ./setup-configs.sh && exec ./run.sh
+CMD cd /docker-registry && ./setup-configs.sh && exec docker-registry

README.md

@@ -349,7 +349,7 @@ sudo apt-get install build-essential python-dev libevent-dev python-pip libssl-d
 Then install the Registry app:
 
 ```
-sudo pip install -r requirements.txt
+sudo pip install .
 ```
 
 #### On Red Hat-based systems:
@@ -365,13 +365,13 @@ should not require the additional repositories.
 Then install the Registry app:
 
 ```
-sudo python-pip install -r requirements.txt
+sudo python-pip install .
 ```
 
 #### Run it
 
 ```
-gunicorn --access-logfile - --debug -k gevent -b 0.0.0.0:5000 -w 1 wsgi:application
+gunicorn --access-logfile - --debug -k gevent -b 0.0.0.0:5000 -w 1 docker_registry.wsgi:application
 ```
 
 ### How do I setup user accounts?
@@ -388,7 +388,7 @@ You could use for instance supervisord to spawn the registry with 8 workers
 using this command:
 
 ```
-gunicorn -k gevent --max-requests 100 --graceful-timeout 3600 -t 3600 -b localhost:5000 -w 8 wsgi:application
+gunicorn -k gevent --max-requests 100 --graceful-timeout 3600 -t 3600 -b localhost:5000 -w 8 docker_registry.wsgi:application
 ```
 
 Note that when using multiple workers, the secret_key for the Flask session

build.sh

@@ -7,7 +7,7 @@ cd $SERVICE_APPROOT
 . ~/env/bin/activate
 
 [ -f requirements.txt ] &&
-    pip install --download-cache=~/.pip-cache -r requirements.txt || exit 1
+    pip install --download-cache=~/.pip-cache . || exit 1
 
 cp -R * ~/
 

docker_registry/__init__.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+from __future__ import print_function
+
+# this must happen before anything else
+import gevent.monkey
+gevent.monkey.patch_all()
+
+from argparse import ArgumentParser
+from argparse import RawTextHelpFormatter
+import distutils.spawn
+import os
+import sys
+
+from .app import app
+from .tags import *
+from .images import *
+from .lib import config
+from .status import *
+
+cfg = config.load()
+if cfg.standalone is not False:
+    # If standalone mode is enabled (default), load the fake Index routes
+    from .index import *
+
+
+DESCRIPTION = """run the docker-registry with gunicorn, honoring the following environment variables:
+
+GUNICORN_WORKERS: number of worker processes gunicorn should start
+REGISTRY_PORT: TCP port to bind to on all ipv4 addresses; default is 5000
+GUNICORN_GRACEFUL_TIMEOUT: timeout in seconds for graceful worker restart
+GUNiCORN_SILENT_TIMEOUT: timeout in seconds for restarting silent workers
+"""
+
+
+def run_gunicorn():
+    """
+    Exec gunicorn with our wsgi app.
+
+    Settings are taken from environment variables as listed in the help text.
+    This is intended to be called as a console_script entry point.
+    """
+
+    # this only exists to provide help/usage text
+    parser = ArgumentParser(description=DESCRIPTION,
+                            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')
+
+    address = '0.0.0.0:{0}'.format(port)
+
+    gunicorn_path = distutils.spawn.find_executable('gunicorn')
+    if gunicorn_path is None:
+        print('error: gunicorn executable not found', file=sys.stderr)
+        sys.exit(1)
+
+    os.execl(gunicorn_path, 'gunicorn', '--access-logfile', '-', '--debug',
+             '--max-requests', '100', '--graceful-timeout', graceful_timeout,
+             '-t', silent_timeout, '-k', 'gevent', '-b', address, '-w', workers,
+             'docker_registry.wsgi:application')

registry/app.py renamed to docker_registry/app.py

@@ -9,8 +9,8 @@
     bugsnag = None
 import flask
 
-import config
-import toolkit
+from . import toolkit
+from .lib import config
 
 
 VERSION = '0.6.8'

registry/images.py renamed to docker_registry/images.py

@@ -7,17 +7,18 @@
 import flask
 import simplejson as json
 
-import cache
-import checksums
-import mirroring
-import storage
-import toolkit
 
+from . import storage
+from . import toolkit
 from .app import app
 from .app import cfg
-import layers
+from .lib import cache
+from .lib import checksums
+from .lib import layers
+from .lib import mirroring
+from .storage import local
+
 
-import storage.local
 store = storage.load()
 logger = logging.getLogger(__name__)
 
@@ -62,7 +63,7 @@ def _get_image_layer(image_id, headers=None, bytes_range=None):
     accel_uri_prefix = cfg.nginx_x_accel_redirect
     path = store.image_layer_path(image_id)
     if accel_uri_prefix:
-        if isinstance(store, storage.local.LocalStorage):
+        if isinstance(store, local.LocalStorage):
             accel_uri = '/'.join([accel_uri_prefix, path])
             headers['X-Accel-Redirect'] = accel_uri
             logger.debug('send accelerated {0} ({1})'.format(

registry/index.py renamed to docker_registry/index.py

@@ -3,11 +3,11 @@
 import flask
 import simplejson as json
 
-import config
-import mirroring
-import signals
-import storage
-import toolkit
+from . import storage
+from . import toolkit
+from .lib import config
+from .lib import mirroring
+from .lib import signals
 
 from .app import app
 

lib/__init__.py renamed to docker_registry/lib/__init__.py

@@ -2,7 +2,7 @@
 
 import redis
 
-import config
+from . import config
 
 
 # Default options