Harmonize gunicorn ways to launch and cleanup

I'm deprecating the direct gunicorn launch stance, which only increases the confusion (we already have two ways to launch, and there is zero reason now ro not use docker-registry since @wking introduced generics opts.

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

Author: Olivier Gambier

config/gunicorn_config.py

@@ -0,0 +1,28 @@
+# Gunicorn config file
+
+import os
+
+flavor = os.environ.get('SETTINGS_FLAVOR', 'dev')
+
+reload = True
+bind = '%s:%s' % (
+    os.environ.get('REGISTRY_HOST', '0.0.0.0'),
+    os.environ.get('REGISTRY_PORT', '5000')
+)
+graceful_timeout = int(os.environ.get('GUNICORN_GRACEFUL_TIMEOUT'), 3600)
+timeout = int(os.environ.get('GUNICORN_SILENT_TIMEOUT'), 3600)
+worker_class = 'gevent'
+max_requests = 100
+workers = int(os.environ.get('GUNICORN_WORKERS', 4))
+log_level = 'debug'
+debug = True
+accesslog = os.environ.get('GUNICORN_ACCESS_LOG_FILE', '-')
+errorlog = os.environ.get('GUNICORN_ERROR_LOG_FILE', '-')
+access_log_format = ('%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" '
+                     '"%(a)s" %(D)s %({X-Docker-Size}o)s')
+
+if flavor == 'prod' or flavor == 'staging':
+    reload = False
+    workers = 8
+    debug = False
+    log_level = 'info'

contrib/gunicorn_config.py

@@ -73,6 +73,7 @@ def run_gunicorn():
         '--error-logfile', env.source('GUNICORN_ERROR_LOG_FILE'),
         '--max-requests', '100',
         '-k', 'gevent',
+        '--reload', False if env.source('SETTINGS_FLAVOR') == 'prod' else True,
         '--graceful-timeout', env.source('GUNICORN_GRACEFUL_TIMEOUT'),
         '-t', env.source('GUNICORN_SILENT_TIMEOUT'),
         '-w', env.source('GUNICORN_WORKERS'),
@@ -97,7 +98,5 @@ def run_gunicorn():
         else:
             logger.warn('You asked we drop priviledges, but we are not root!')
 
-    # Stringify all args
-    for (k, v) in enumerate(args):
-        args[k] = str(v)
-    os.execl(*args)
+    # Stringify all args and call
+    os.execl(*[str(v) for v in args])

docker_registry/run.py

@@ -13,6 +13,8 @@
     'GUNICORN_WORKERS': '4',
     'GUNICORN_GRACEFUL_TIMEOUT': '3600',
     'GUNICORN_SILENT_TIMEOUT': '3600',
+    'GUNICORN_USER': '',
+    'GUNICORN_GROUP': '',
     'GUNICORN_ACCESS_LOG_FILE': '"-"',
     'GUNICORN_ERROR_LOG_FILE': '"-"',
     'GUNICORN_OPTS': '[]',