Reorganize Dockerfile, add a make target for images. (#48)

integration_tests/executor/Dockerfile

@@ -1,23 +0,0 @@
-# Copyright 2018 Google, Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Builds the static Go image to execute in a Kubernetes job
-
-FROM scratch
-ADD out/executor /kbuild/executor
-ADD files/ca-certificates.crt /etc/ssl/certs/
-ADD files/docker-credential-gcr /usr/local/bin/
-ADD files/config.json /root/.docker/
-ENV HOME /root
-ENV PATH /usr/local/bin

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},