Finish the implementation of local userfiles. Strip charsets from mimetypes in the build worker. Add canonical name ordering to the build queue. Port all queues to the canonical naming version.

endpoints/api/discovery.py

@@ -28,8 +28,7 @@ SERVER_HOSTNAME = app.config['SERVER_HOSTNAME']
 
 
 def fully_qualified_name(method_view_class):
-  inst = method_view_class()
-  return '%s.%s' % (inst.__module__, inst.__class__.__name__)
+  return '%s.%s' % (method_view_class.__module__, method_view_class.__name__)
 
 
 def swagger_route_data(include_internal=False, compact=False):

endpoints/common.py

@@ -160,7 +160,7 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
                                                 dockerfile_id, build_name,
                                                 trigger, pull_robot_name = pull_robot_name)
 
-  dockerfile_build_queue.put(json.dumps({
+  dockerfile_build_queue.put([repository.namespace, repository.name], json.dumps({
     'build_uuid': build_request.uuid,
     'namespace': repository.namespace,
     'repository': repository.name,

endpoints/index.py

@@ -315,7 +315,7 @@ def update_images(namespace, repository):
         'pushed_image_count': len(image_with_checksums),
         'pruned_image_count': num_removed,
       }
-      webhook_queue.put(json.dumps(webhook_data))
+      webhook_queue.put([namespace, repository], json.dumps(webhook_data))
 
     return make_response('Updated', 204)
 

endpoints/registry.py

@@ -179,7 +179,7 @@ def put_image_layer(namespace, repository, image_id):
   # The layer is ready for download, send a job to the work queue to
   # process it.
   logger.debug('Queing diffs job for image: %s' % image_id)
-  image_diff_queue.put(json.dumps({
+  image_diff_queue.put([namespace, repository, image_id], json.dumps({
     'namespace': namespace,
     'repository': repository,
     'image_id': image_id,
@@ -232,7 +232,7 @@ def put_image_checksum(namespace, repository, image_id):
   # The layer is ready for download, send a job to the work queue to
   # process it.
   logger.debug('Queing diffs job for image: %s' % image_id)
-  image_diff_queue.put(json.dumps({
+  image_diff_queue.put([namespace, repository, image_id], json.dumps({
     'namespace': namespace,
     'repository': repository,
     'image_id': image_id,

endpoints/webhooks.py

@@ -5,7 +5,6 @@ from flask import request, make_response, Blueprint
 
 from app import billing as stripe
 from data import model
-from data.queue import dockerfile_build_queue
 from auth.auth import process_auth
 from auth.permissions import ModifyRepositoryPermission
 from util.invoice import renderInvoiceToHtml