Merge remote-tracking branch 'origin/master' into ncc1701

Conflicts:
	endpoints/web.py
	static/directives/signup-form.html
	static/js/app.js
	static/js/controllers.js
	static/partials/landing.html
	static/partials/view-repo.html
	test/data/test.db

endpoints/trigger.py

@@ -2,6 +2,7 @@ import logging
 import io
 import os.path
 import tarfile
+import base64
 
 from github import Github, UnknownObjectException, GithubException
 from tempfile import SpooledTemporaryFile
@@ -45,6 +46,19 @@ class BuildTrigger(object):
   def __init__(self):
     pass
 
+  def dockerfile_url(self, auth_token, config):
+    """
+    Returns the URL at which the Dockerfile for the trigger can be found or None if none/not applicable.
+    """
+    return None
+
+  def load_dockerfile_contents(self, auth_token, config):
+    """
+    Loads the Dockerfile found for the trigger's config and returns them or None if none could
+    be found/loaded.
+    """
+    return None
+
   def list_build_sources(self, auth_token):
     """
     Take the auth information for the specific trigger type and load the
@@ -167,7 +181,6 @@ class GithubBuildTrigger(BuildTrigger):
 
     return config
 
-
   def list_build_sources(self, auth_token):
     gh_client = self._get_client(auth_token)
     usr = gh_client.get_user()
@@ -218,6 +231,41 @@ class GithubBuildTrigger(BuildTrigger):
 
       raise RepositoryReadException(message)
 
+  def dockerfile_url(self,  auth_token, config):
+    source = config['build_source']
+    subdirectory = config.get('subdir', '')
+    path = subdirectory + '/Dockerfile' if subdirectory else 'Dockerfile'
+
+    gh_client = self._get_client(auth_token)
+    try:
+      repo = gh_client.get_repo(source)
+      master_branch = repo.master_branch or 'master'
+      return 'https://github.com/%s/blob/%s/%s' % (source, master_branch, path)
+    except GithubException as ge:
+      return None
+
+  def load_dockerfile_contents(self, auth_token, config):
+    gh_client = self._get_client(auth_token)
+
+    source = config['build_source']
+    subdirectory = config.get('subdir', '')
+    path = subdirectory + '/Dockerfile' if subdirectory else 'Dockerfile'
+
+    try:
+      repo = gh_client.get_repo(source)
+      file_info = repo.get_file_contents(path)
+      if file_info is None:
+        return None
+
+      content = file_info.content
+      if file_info.encoding == 'base64':
+        content = base64.b64decode(content)
+      return content
+
+    except GithubException as ge:
+      message = ge.data.get('message', 'Unable to read Dockerfile: %s' % source)
+      raise RepositoryReadException(message)
+
   @staticmethod
   def _prepare_build(config, repo, commit_sha, build_name, ref):
     # Prepare the download and upload URLs