From d9c31044b93fe8bb93d36ec4bdaefb8a7380278f Mon Sep 17 00:00:00 2001 From: dlorenc Date: Mon, 26 Mar 2018 09:53:41 -0700 Subject: [PATCH] Reorganize Dockerfile, add a make target for images. (#48) --- Makefile | 4 ++++ {integration_tests/executor => deploy}/Dockerfile | 0 integration_tests/integration_test_yaml.go | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) rename {integration_tests/executor => deploy}/Dockerfile (100%) diff --git a/Makefile b/Makefile index 9d1064eb8..1694112bf 100644 --- 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 b/deploy/Dockerfile similarity index 100% rename from integration_tests/executor/Dockerfile rename to deploy/Dockerfile diff --git a/integration_tests/integration_test_yaml.go b/integration_tests/integration_test_yaml.go index 545add4d5..e81d4269d 100644 --- 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},