Prepare the build worker to support multiple tags and subdirectories. Change the build database config to accept a job config object instead of breaking out the parameters into independent blocks.

data/database.py

@@ -237,8 +237,7 @@ class RepositoryBuild(BaseModel):
   uuid = CharField(default=uuid_generator, index=True)
   repository = ForeignKeyField(Repository, index=True)
   access_token = ForeignKeyField(AccessToken)
-  resource_key = CharField()
-  tag = CharField()
+  job_config = TextField()
   phase = CharField(default='waiting')
   started = DateTimeField(default=datetime.now)
   display_name = CharField()

data/model.py

@@ -1409,10 +1409,10 @@ def list_repository_builds(namespace_name, repository_name,
   return query
 
 
-def create_repository_build(repo, access_token, resource_key, tag,
+def create_repository_build(repo, access_token, job_config_obj,
                             display_name, trigger=None):
   return RepositoryBuild.create(repository=repo, access_token=access_token,
-                                resource_key=resource_key, tag=tag,
+                                job_config=json.dumps(job_config_obj),
                                 display_name=display_name, trigger=trigger)
 
 

data/queue.py

@@ -68,5 +68,5 @@ class WorkQueue(object):
 
 
 image_diff_queue = WorkQueue('imagediff')
-dockerfile_build_queue = WorkQueue('dockerfilebuild2')
+dockerfile_build_queue = WorkQueue('dockerfilebuild3')
 webhook_queue = WorkQueue('webhook')