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.

endpoints/api.py

@@ -1144,7 +1144,7 @@ def build_status_view(build_obj, can_write=False):
     'started': build_obj.started,
     'display_name': build_obj.display_name,
     'status': status,
-    'resource_key': build_obj.resource_key if can_write else None,
+    'job_config': json.loads(build_obj.job_config) if can_write else None,
     'is_writer': can_write,
     'trigger': trigger_view(build_obj.trigger),
   }
@@ -1234,11 +1234,13 @@ def request_repo_build(namespace, repository):
     logger.debug('User requested repository initialization.')
     dockerfile_id = request.get_json()['file_id']
 
-    # Check if the dockerfile resource has already been used. If so, then it can only be reused if the
-    # user has access to the repository for which it was used.
+    # Check if the dockerfile resource has already been used. If so, then it
+    # can only be reused if the user has access to the repository for which it
+    # was used.
     associated_repository = model.get_repository_for_resource(dockerfile_id)
     if associated_repository:
-      if not ModifyRepositoryPermission(associated_repository.namespace, associated_repository.name):
+      if not ModifyRepositoryPermission(associated_repository.namespace,
+                                        associated_repository.name):
         abort(403)
 
     # Start the build.
@@ -1248,9 +1250,15 @@ def request_repo_build(namespace, repository):
     logger.debug('**********Md5: %s' % display_name)
 
     host = urlparse.urlparse(request.url).netloc
-    tag = '%s/%s/%s' % (host, repo.namespace, repo.name)
-    build_request = model.create_repository_build(repo, token, dockerfile_id,
-                                                  tag, display_name)
+    repo = '%s/%s/%s' % (host, repo.namespace, repo.name)
+    job_config = {
+      'docker_tags': ['latest'],
+      'build_subdir': '',
+      'repository': repo,
+      'resource_key': dockerfile_id,
+    }
+    build_request = model.create_repository_build(repo, token, job_config,
+                                                  display_name)
     dockerfile_build_queue.put(json.dumps({
       'build_uuid': build_request.uuid,
       'namespace': namespace,

endpoints/trigger.py

@@ -55,7 +55,8 @@ class BuildTrigger(object):
 
   def handle_trigger_request(self, request, auth_token, config):
     """
-    Transform the incoming request data into a set of actions.
+    Transform the incoming request data into a set of actions. Returns a tuple
+    of usefiles resource id, docker tags, build name, and resource subdir.
     """
     raise NotImplementedError
 
@@ -163,7 +164,7 @@ class GithubBuildTrigger(BuildTrigger):
 
     try:
       repo = gh_client.get_repo(source)
-      default_commit = repo.get_branch(repo.default_branch).commit
+      default_commit = repo.get_branch(repo.master_branch).commit
       commit_tree = repo.get_git_tree(default_commit.sha, recursive=True)
 
       return [os.path.dirname(elem.path) for elem in commit_tree.tree
@@ -181,7 +182,8 @@ class GithubBuildTrigger(BuildTrigger):
 
     logger.debug('Payload %s', payload)
     ref = payload['ref']
-    commit_id = payload['head_commit']['id'][0:7]
+    commit_sha = payload['head_commit']['id']
+    short_sha = commit_sha[0:7]
 
     gh_client = self._get_client(auth_token)
 
@@ -192,8 +194,7 @@ class GithubBuildTrigger(BuildTrigger):
     logger.debug('Github repo: %s', repo)
 
     # Prepare the download and upload URLs
-    branch_name = ref.split('/')[-1]
-    archive_link = repo.get_archive_link('zipball', branch_name)
+    archive_link = repo.get_archive_link('zipball', short_sha)
     download_archive = client.get(archive_link, stream=True)
 
     with SpooledTemporaryFile(CHUNK_SIZE) as zipball:
@@ -204,4 +205,17 @@ class GithubBuildTrigger(BuildTrigger):
 
     logger.debug('Successfully prepared job')
 
-    return dockerfile_id, branch_name, commit_id
+    # compute the tag(s)
+    pushed_branch = ref.split('/')[-1]
+    tags = {pushed_branch}
+    if pushed_branch == repo.master_branch:
+      tags.add('latest')
+    logger.debug('Pushing to tags: %s' % tags)
+
+    # compute the subdir
+    repo_subdir = config['subdir']
+    zipball_subdir = '%s-%s-%s' % (repo.owner.login, repo.name, short_sha)
+    joined_subdir = os.path.join(zipball_subdir, repo_subdir)
+    logger.debug('Final subdir: %s' % joined_subdir)
+
+    return dockerfile_id, list(tags), short_sha, joined_subdir

endpoints/webhooks.py

@@ -1,10 +1,12 @@
 import logging
 import stripe
 import urlparse
+import json
 
 from flask import request, make_response, Blueprint
 
 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
@@ -62,22 +64,36 @@ def build_trigger_webhook(namespace, repository, trigger_uuid):
 
     logger.debug('Passing webhook request to handler %s', handler)
     try:
-      df_id, tag, name = handler.handle_trigger_request(request,
-                                                        trigger.auth_token,
-                                                        trigger.config)
+      specs = handler.handle_trigger_request(request, trigger.auth_token,
+                                             json.loads(trigger.config))
+      dockerfile_id, tags, name, subdir = specs
+
     except ValidationRequestException:
-      # This was just a validation request, don't need to build anything
+      # This was just a validation request, we don't need to build anything
       return make_response('Okay')
 
     host = urlparse.urlparse(request.url).netloc
-    full_tag = '%s/%s/%s:%s' % (host, trigger.repository.namespace,
-                                trigger.repository.name, tag)
+    repo = '%s/%s/%s' % (host, trigger.repository.namespace,
+                         trigger.repository.name)
 
     token = model.create_access_token(trigger.repository, 'write')
-    logger.debug('Creating build %s with full_tag %s and dockerfile_id %s',
-                 name, full_tag, df_id)
-    model.create_repository_build(trigger.repository, token, df_id, full_tag,
-                                  name)
+    logger.debug('Creating build %s with repo %s tags %s and dockerfile_id %s',
+                 name, repo, tags, dockerfile_id)
+
+    job_config = {
+      'docker_tags': tags,
+      'repository': repo,
+      'build_subdir': subdir,
+      'resource_key': dockerfile_id,
+    }
+    build_request = model.create_repository_build(trigger.repository, token,
+                                                  job_config, name)
+
+    dockerfile_build_queue.put(json.dumps({
+      'build_uuid': build_request.uuid,
+      'namespace': namespace,
+      'repository': repository,
+    }), retries_remaining=1)
 
     return make_response('Okay')