Fix #368

Various gunicorn launch stances are now more uniform.
Normalized the use of environment variables to bind the host and port.
Synching contrib scripts that fall out of synch earlier.

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

Author: Mangled Deutz

contrib/docker-registry.conf

@@ -9,9 +9,10 @@ env REGISTRY_DIR=/srv/docker/registry
 env USER=www-data
 env GROUP=www-data
 env LOG_FILE=/var/log/docker/registry.log
-env NUM_WORKERS=9
+env GUNICORN_WORKERS=9
 
-env ADDRESS=127.0.0.1:5000
+env REGISTRY_PORT=5000
+env REGISTRY_HOST=127.0.0.1
 
 
 pre-start script
@@ -27,5 +28,5 @@ script
 
     [ -r $REGISTRY_DIR/.venv/bin/activate ] && . $REGISTRY_DIR/.venv/bin/activate
     cd $REGISTRY_DIR
-    exec gunicorn -w $NUM_WORKERS --bind=$ADDRESS --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE wsgi:application
+    exec gunicorn -w $GUNICORN_WORKERS --bind=$REGISTRY_HOST:$REGISTRY_PORT --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE docker_registry.wsgi:application
 end script

contrib/docker-registry_RHEL.sh

@@ -43,7 +43,7 @@ self_dir="${self_path%%/${self_path##*/}}"
 
 NAME="Docker Registry"
 DAEMON="/usr/bin/gunicorn"
-DAEMON_OPTS="-D --error-logfile ${ERROR_LOGFILE} --access-logfile ${ACCESS_LOGFILE} --log-file ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} wsgi:application"
+DAEMON_OPTS="-D --error-logfile ${ERROR_LOGFILE} --access-logfile ${ACCESS_LOGFILE} --log-file ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} docker_registry.wsgi:application"
 
 RED='\e[0;31m'
 GREEN='\e[0;32m'

contrib/docker-registry_debian.sh

@@ -5,7 +5,7 @@
 # Required-Start:  $network $remote_fs $syslog
 # Required-Stop:   $network $remote_fs $syslog
 # Default-Start:   2 3 4 5
-# Default-Stop:    0 1 6 
+# Default-Stop:    0 1 6
 # Short-Description: Start Docker-Registry
 ### END INIT INFO
 
@@ -33,15 +33,15 @@ self_dir="${self_path%%/${self_path##*/}}"
 # set defaults if they are not set by config
 [[ -z "$RUNAS" ]] && RUNAS=$(stat --format "%U" $self_path)                  # defaults to user owning this init script
 [[ -z "$LOGFILE" ]] && LOGFILE=/var/log/docker-registry.log                  # will be chowned to $RUNAS
-[[ -z "$PIDFILE" ]] && PIDFILE=/var/run/docker-registry/docker-registry.pid  # path will created and chowned to $RUNAS 
+[[ -z "$PIDFILE" ]] && PIDFILE=/var/run/docker-registry/docker-registry.pid  # path will created and chowned to $RUNAS
 [[ -z "$LISTEN_IP" ]]            && LISTEN_IP="0.0.0.0"
 [[ -z "$LISTEN_PORT" ]]          && LISTEN_PORT=5000
 [[ -z "$GUNICORN_WORKERS" ]]     && GUNICORN_WORKERS=2
 [[ -z "$DOCKER_REGISTRY_HOME" ]] && DOCKER_REGISTRY_HOME=${self_dir%/*}
 
 NAME="Docker Registry"
 DAEMON="/usr/local/bin/gunicorn"
-DAEMON_OPTS="-D --access-logfile ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} wsgi:application"
+DAEMON_OPTS="-D --access-logfile ${LOGFILE} --pid ${PIDFILE} --max-requests 500 --graceful-timeout 3600 -t 3600 -k gevent -b ${LISTEN_IP}:${LISTEN_PORT} -w ${GUNICORN_WORKERS:-2} docker_registry.wsgi:application"
 
 RED='\e[0;31m'
 GREEN='\e[0;32m'

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/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