Creating github Build Context

Gopkg.toml

@@ -42,3 +42,7 @@ required = [
 [[override]]
   name = "k8s.io/apimachinery"
   version = "kubernetes-1.11.0"
+
+[[constraint]]
+  name = "gopkg.in/src-d/go-git.v4"
+  version = "4.6.0"

Makefile

@@ -20,6 +20,7 @@ VERSION_BUILD ?= 0
 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION_PACKAGE = $(REPOPATH/pkg/version)
 
+SHELL := /bin/bash
 GOOS ?= $(shell go env GOOS)
 GOARCH = amd64
 ORG := github.com/GoogleContainerTools

README.md

@@ -119,10 +119,14 @@ When running kaniko, use the `--context` flag with the appropriate prefix to spe
 | Local Directory  | dir://[path to a directory in the kaniko container]  |
 | GCS Bucket       | gs://[bucket name]/[path to .tar.gz]     |
 | S3 Bucket        | s3://[bucket name]/[path to .tar.gz]     |
+| Git Repository   | git://[repository url]     |
 
 If you don't specify a prefix, kaniko will assume a local directory.
 For example, to use a GCS bucket called `kaniko-bucket`, you would pass in `--context=gs://kaniko-bucket/path/to/context.tar.gz`.
 
+### Using Private Git Repository
+You can use `Personal Access Tokens` for Build Contexts from Private Repositories from [GitHub](https://blog.github.com/2012-09-21-easier-builds-and-deployments-using-git-over-https-and-oauth/).
+
 ### Running kaniko
 
 There are several different ways to deploy and run kaniko:

integration/images.go

@@ -178,7 +178,6 @@ func (d *DockerFileBuilder) BuildImage(imageRepo, gcsBucket, dockerfilesPath, do
 		if d == dockerfile {
 			contextFlag = "-b"
 			contextPath = gcsBucket
-			break
 		}
 	}
 

integration/integration_test.go

@@ -30,10 +30,9 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/sync/errgroup"
-
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1/daemon"
+	"golang.org/x/sync/errgroup"
 
 	"github.com/GoogleContainerTools/kaniko/pkg/timing"
 	"github.com/GoogleContainerTools/kaniko/pkg/util"
@@ -236,6 +235,49 @@ func TestRun(t *testing.T) {
 	}
 }
 
+func TestGitBuildcontext(t *testing.T) {
+	repo := "github.com/GoogleContainerTools/kaniko"
+	dockerfile := "integration/dockerfiles/Dockerfile_test_run_2"
+
+	// Build with docker
+	dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git")
+	dockerCmd := exec.Command("docker",
+		append([]string{"build",
+			"-t", dockerImage,
+			"-f", dockerfile,
+			repo})...)
+	out, err := RunCommandWithoutTest(dockerCmd)
+	if err != nil {
+		t.Errorf("Failed to build image %s with docker command \"%s\": %s %s", dockerImage, dockerCmd.Args, err, string(out))
+	}
+
+	// Build with kaniko
+	kanikoImage := GetKanikoImage(config.imageRepo, "Dockerfile_test_git")
+	kanikoCmd := exec.Command("docker",
+		append([]string{"run",
+			"-v", os.Getenv("HOME") + "/.config/gcloud:/root/.config/gcloud",
+			ExecutorImage,
+			"-f", dockerfile,
+			"-d", kanikoImage,
+			"-c", fmt.Sprintf("git://%s", repo)})...)
+
+	out, err = RunCommandWithoutTest(kanikoCmd)
+	if err != nil {
+		t.Errorf("Failed to build image %s with kaniko command \"%s\": %v %s", dockerImage, kanikoCmd.Args, err, string(out))
+	}
+
+	// container-diff
+	daemonDockerImage := daemonPrefix + dockerImage
+	containerdiffCmd := exec.Command("container-diff", "diff", "--no-cache",
+		daemonDockerImage, kanikoImage,
+		"-q", "--type=file", "--type=metadata", "--json")
+	diff := RunCommand(containerdiffCmd, t)
+	t.Logf("diff = %s", string(diff))
+
+	expected := fmt.Sprintf(emptyContainerDiff, dockerImage, kanikoImage, dockerImage, kanikoImage)
+	checkContainerDiffOutput(t, diff, expected)
+}
+
 func TestLayers(t *testing.T) {
 	offset := map[string]int{
 		"Dockerfile_test_add":     11,

pkg/buildcontext/buildcontext.go

@@ -42,6 +42,8 @@ func GetBuildContext(srcContext string) (BuildContext, error) {
 		return &S3{context: context}, nil
 	case constants.LocalDirBuildContextPrefix:
 		return &Dir{context: context}, nil
+	case constants.GitBuildContextPrefix:
+		return &Git{context: context}, nil
 	}
-	return nil, errors.New("unknown build context prefix provided, please use one of the following: gs://, dir://, s3://")
+	return nil, errors.New("unknown build context prefix provided, please use one of the following: gs://, dir://, s3://, git://")
 }