mirror of
https://github.com/GoogleContainerTools/kaniko
synced 2026-10-19 11:10:45 +02:00
Merge branch 'issue#269' of https://github.com/vkartik97/kaniko into vkartik97-issue#269
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
FROM scratch
|
||||
COPY LICENSE /LICENSE
|
||||
+12
-2
@@ -71,6 +71,7 @@ var additionalKanikoFlagsMap = map[string][]string{
|
||||
"Dockerfile_test_target": {"--target=second"},
|
||||
}
|
||||
|
||||
var gitRepoTests = []string{"Dockerfile_test_git"}
|
||||
var bucketContextTests = []string{"Dockerfile_test_copy_bucket"}
|
||||
var reproducibleTests = []string{"Dockerfile_test_reproducible"}
|
||||
|
||||
@@ -156,11 +157,15 @@ func (d *DockerFileBuilder) BuildImage(imageRepo, gcsBucket, dockerfilesPath, do
|
||||
// build docker image
|
||||
additionalFlags := append(buildArgs, additionalDockerFlagsMap[dockerfile]...)
|
||||
dockerImage := strings.ToLower(imageRepo + dockerPrefix + dockerfile)
|
||||
dockerPath := "."
|
||||
if dockerfile == "Dockerfile_test_git" {
|
||||
dockerPath = "https://github.com/GoogleContainerTools/kaniko"
|
||||
}
|
||||
dockerCmd := exec.Command("docker",
|
||||
append([]string{"build",
|
||||
"-t", dockerImage,
|
||||
"-f", path.Join(dockerfilesPath, dockerfile),
|
||||
"."},
|
||||
dockerPath},
|
||||
additionalFlags...)...,
|
||||
)
|
||||
|
||||
@@ -177,7 +182,12 @@ func (d *DockerFileBuilder) BuildImage(imageRepo, gcsBucket, dockerfilesPath, do
|
||||
if d == dockerfile {
|
||||
contextFlag = "-b"
|
||||
contextPath = gcsBucket
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
for _, d := range gitRepoTests {
|
||||
if d == dockerfile {
|
||||
contextPath = "git://https://github.com/GoogleContainerTools/kaniko"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user