Merge branch 'master' of github.com:GoogleCloudPlatform/k8s-container…

…-builder into env-replacement
GoogleContainerTools · Mar 26, 2018 · a82b96e · a82b96e
2 parents dbb0774 + d9c3104
commit a82b96e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -48,3 +48,7 @@ test: out/executor out/kbuild
 .PHONY: integration-test
 integration-test: out/executor out/kbuild
 	@ ./integration-test.sh
+
+.PHONY: images
+images: out/executor out/kbuild
+	docker build -t $(REGISTRY)/executor:latest -f deploy/Dockerfile .
diff --git a/integration_tests/executor/Dockerfile → deploy/Dockerfile b/integration_tests/executor/Dockerfile → deploy/Dockerfile
diff --git a/integration_tests/integration_test_yaml.go b/integration_tests/integration_test_yaml.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"fmt"
+
 	"gopkg.in/yaml.v2"
 )
 
@@ -116,7 +117,7 @@ func main() {
 	// Build executor image
 	buildExecutorImage := step{
 		Name: dockerImage,
-		Args: []string{"build", "-t", executorImage, "-f", "integration_tests/executor/Dockerfile", "."},
+		Args: []string{"build", "-t", executorImage, "-f", "deploy/Dockerfile", "."},
 	}
 	y := testyaml{
 		Steps: []step{containerDiffStep, containerDiffPermissions, structureTestsStep, structureTestPermissions, buildExecutorImage},