From 317d1b7017a42e4980577eee4262e2a0917c1759 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Thu, 23 May 2019 16:12:20 +0200 Subject: [PATCH 1/2] Improve git buildcontext integration test Build a dockerfile that will copy the LICENSE from the kaniko github repository into the image to make sure the git buildcontext works as expected. --- integration/dockerfiles/Dockerfile_git_buildcontext | 2 ++ integration/integration_test.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 integration/dockerfiles/Dockerfile_git_buildcontext diff --git a/integration/dockerfiles/Dockerfile_git_buildcontext b/integration/dockerfiles/Dockerfile_git_buildcontext new file mode 100644 index 000000000..9636fcd3d --- /dev/null +++ b/integration/dockerfiles/Dockerfile_git_buildcontext @@ -0,0 +1,2 @@ +FROM scratch +COPY LICENSE ./LICENSE diff --git a/integration/integration_test.go b/integration/integration_test.go index c11dd1378..3d046b53d 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -237,7 +237,7 @@ func TestRun(t *testing.T) { func TestGitBuildcontext(t *testing.T) { repo := "github.com/GoogleContainerTools/kaniko" - dockerfile := "integration/dockerfiles/Dockerfile_test_run_2" + dockerfile := "integration/dockerfiles/Dockerfile_git_buildcontext" // Build with docker dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git") From e2a4098b8ef9116ceff885637c7629724d76138a Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Wed, 19 Jun 2019 11:06:59 -0700 Subject: [PATCH 2/2] fixed dockerfile path --- integration/integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/integration_test.go b/integration/integration_test.go index 3d046b53d..c11dd1378 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -237,7 +237,7 @@ func TestRun(t *testing.T) { func TestGitBuildcontext(t *testing.T) { repo := "github.com/GoogleContainerTools/kaniko" - dockerfile := "integration/dockerfiles/Dockerfile_git_buildcontext" + dockerfile := "integration/dockerfiles/Dockerfile_test_run_2" // Build with docker dockerImage := GetDockerImage(config.imageRepo, "Dockerfile_test_git")