From 85183aadeeb5e27c78f7f83bfb87ab74f68353c4 Mon Sep 17 00:00:00 2001
From: Priya Wadhwa <priyawadhwa@google.com>
Date: Mon, 2 Apr 2018 11:18:56 -0700
Subject: [PATCH] Add executable as entrypoint to image

---
 deploy/Dockerfile                          | 1 +
 integration_tests/integration_test_yaml.go | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 7871d3cc9..3020be1bc 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -21,3 +21,4 @@ ADD files/docker-credential-gcr /usr/local/bin/
 ADD files/config.json /root/.docker/
 ENV HOME /root
 ENV PATH /usr/local/bin
+ENTRYPOINT ["/kbuild/executor"]
diff --git a/integration_tests/integration_test_yaml.go b/integration_tests/integration_test_yaml.go
index 9e7a19077..ca34024f8 100644
--- a/integration_tests/integration_test_yaml.go
+++ b/integration_tests/integration_test_yaml.go
@@ -107,7 +107,6 @@ type testyaml struct {
 }
 
 var executorImage = "executor-image"
-var executorCommand = "/kbuild/executor"
 var dockerImage = "gcr.io/cloud-builders/docker"
 var ubuntuImage = "ubuntu"
 var testRepo = "gcr.io/kbuild-test/"
@@ -155,7 +154,7 @@ func main() {
 		kbuildImage := testRepo + kbuildPrefix + test.repo
 		kbuild := step{
 			Name: executorImage,
-			Args: []string{executorCommand, "--destination", kbuildImage, "--dockerfile", test.dockerfilePath, "--context", test.context},
+			Args: []string{"--destination", kbuildImage, "--dockerfile", test.dockerfilePath, "--context", test.context},
 		}
 
 		// Pull the kbuild image
@@ -199,7 +198,7 @@ func main() {
 		kbuildImage := testRepo + kbuildPrefix + test.repo
 		kbuild := step{
 			Name: executorImage,
-			Args: []string{executorCommand, "--destination", kbuildImage, "--dockerfile", test.dockerfilePath},
+			Args: []string{"--destination", kbuildImage, "--dockerfile", test.dockerfilePath},
 		}
 		// Pull the kbuild image
 		pullKbuildImage := step{