Merged master

This commit is contained in:
Priya Wadhwa
2018-04-04 13:35:20 -07:00
7 changed files with 69 additions and 70 deletions
+2 -3
View File
@@ -107,7 +107,6 @@ type testyaml struct {
}
var executorImage = "executor-image"
var executorCommand = "/kaniko/executor"
var dockerImage = "gcr.io/cloud-builders/docker"
var ubuntuImage = "ubuntu"
var testRepo = "gcr.io/kaniko-test/"
@@ -155,7 +154,7 @@ func main() {
kanikoImage := testRepo + kanikoPrefix + test.repo
kaniko := step{
Name: executorImage,
Args: []string{executorCommand, "--destination", kanikoImage, "--dockerfile", test.dockerfilePath, "--context", test.context},
Args: []string{"--destination", kanikoImage, "--dockerfile", test.dockerfilePath, "--context", test.context},
}
// Pull the kaniko image
@@ -199,7 +198,7 @@ func main() {
kanikoImage := testRepo + kanikoPrefix + test.repo
kaniko := step{
Name: executorImage,
Args: []string{executorCommand, "--destination", kanikoImage, "--dockerfile", test.dockerfilePath},
Args: []string{"--destination", kanikoImage, "--dockerfile", test.dockerfilePath},
}
// Pull the kaniko image
pullKanikoImage := step{