First attempt at making config loadable through string config overrides in an env variable.

endpoints/api/build.py

@@ -3,7 +3,7 @@ import json
 
 from flask import request
 
-from app import app
+from app import app, userfiles as user_files
 from endpoints.api import (RepositoryParamResource, parse_args, query_param, nickname, resource,
                            require_repo_read, require_repo_write, validate_json_request,
                            ApiResource, internal_only, format_date, api, Unauthorized, NotFound)
@@ -17,7 +17,6 @@ from util.names import parse_robot_username
 
 
 logger = logging.getLogger(__name__)
-user_files = app.config['USERFILES']
 build_logs = app.config['BUILDLOGS']
 
 

endpoints/api/discovery.py

@@ -23,8 +23,8 @@ TYPE_CONVERTER = {
   int: 'integer',
 }
 
-URL_SCHEME = app.config['URL_SCHEME']
-URL_HOST = app.config['URL_HOST']
+PREFERRED_URL_SCHEME = app.config['PREFERRED_URL_SCHEME']
+SERVER_NAME = app.config['SERVER_NAME']
 
 
 def fully_qualified_name(method_view_class):
@@ -143,7 +143,7 @@ def swagger_route_data(include_internal=False, compact=False):
   swagger_data = {
     'apiVersion': 'v1',
     'swaggerVersion': '1.2',
-    'basePath': '%s://%s' % (URL_SCHEME, URL_HOST),
+    'basePath': '%s://%s' % (PREFERRED_URL_SCHEME, SERVER_NAME),
     'resourcePath': '/',
     'info': {
       'title': 'Quay.io API',
@@ -160,7 +160,7 @@ def swagger_route_data(include_internal=False, compact=False):
           "implicit": {
             "tokenName": "access_token",
             "loginEndpoint": {
-              "url": "%s://%s/oauth/authorize" % (URL_SCHEME, URL_HOST),
+              "url": "%s://%s/oauth/authorize" % (PREFERRED_URL_SCHEME, SERVER_NAME),
             },
           },
         },

endpoints/api/image.py

@@ -2,16 +2,13 @@ import json
 
 from collections import defaultdict
 
-from app import app
+from app import storage as store
 from endpoints.api import (resource, nickname, require_repo_read, RepositoryParamResource,
                            format_date, NotFound)
 from data import model
 from util.cache import cache_control_flask_restful
 
 
-store = app.config['STORAGE']
-
-
 def image_view(image):
   extended_props = image
   if image.storage and image.storage.id:

endpoints/api/trigger.py

@@ -204,9 +204,8 @@ class BuildTriggerActivate(RepositoryParamResource):
                                      trigger.repository.name)
         path = url_for('webhooks.build_trigger_webhook',
                        repository=repository_path, trigger_uuid=trigger.uuid)
-        authed_url = _prepare_webhook_url(app.config['URL_SCHEME'], '$token',
-                                          token.code, app.config['URL_HOST'],
-                                          path)
+        authed_url = _prepare_webhook_url(app.config['PREFERRED_URL_SCHEME'], '$token', token.code,
+                                          app.config['SERVER_NAME'], path)
 
         final_config = handler.activate(trigger.uuid, authed_url,
                                         trigger.auth_token, new_config_dict)