From 894388693407e370438025b8b241551cb73ebcc2 Mon Sep 17 00:00:00 2001
From: slmagus <slmagus>
Date: Wed, 16 Oct 2019 10:48:03 -0400
Subject: [PATCH 1/4] add make images to travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b85d3832b..5f3ebbb63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,3 +7,4 @@ go_import_path: github.com/GoogleContainerTools/kaniko
 
 script:
   - make test
+  - make images

From 7413a516208ae11283d98f8d5490fa26f988c8d1 Mon Sep 17 00:00:00 2001
From: slmagus <slmagus>
Date: Wed, 16 Oct 2019 10:53:39 -0400
Subject: [PATCH 2/4] fix docker build args value, as this passes in a literal
 double single quote

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9ea21d8f..64701b087 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ GO_LDFLAGS += '
 EXECUTOR_PACKAGE = $(REPOPATH)/cmd/executor
 WARMER_PACKAGE = $(REPOPATH)/cmd/warmer
 KANIKO_PROJECT = $(REPOPATH)/kaniko
-BUILD_ARG ?= '' 
+BUILD_ARG ?= 
 
 out/executor: $(GO_FILES)
 	GOARCH=$(GOARCH) GOOS=linux CGO_ENABLED=0 go build -ldflags $(GO_LDFLAGS) -o $@ $(EXECUTOR_PACKAGE)

From 297fd9743b30deee58ec534669cedc9f8139d083 Mon Sep 17 00:00:00 2001
From: slmagus <slmagus>
Date: Wed, 16 Oct 2019 11:55:41 -0400
Subject: [PATCH 3/4] use the binary-bin directory as bazel-genfiles does not
 exist

---
 deploy/Dockerfile_debug | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index 65428e864..39097c1ce 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -29,16 +29,16 @@ RUN make && make out/warmer
 
 # Stage 1: Get the busybox shell
 FROM gcr.io/cloud-builders/bazel:latest
-RUN git clone https://github.com/GoogleContainerTools/distroless.git
+RUN git clone https://github.com/slmagus/distroless.git
 WORKDIR /distroless
 RUN bazel build //experimental/busybox:busybox_tar
-RUN tar -C /distroless/bazel-genfiles/experimental/busybox/ -xf /distroless/bazel-genfiles/experimental/busybox/busybox.tar
+RUN tar -C /distroless/bazel-bin/experimental/busybox/ -xf /distroless/bazel-bin/experimental/busybox/busybox.tar
 
 FROM scratch
 COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/* /kaniko/
 COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
 COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
-COPY --from=1 /distroless/bazel-genfiles/experimental/busybox/busybox/ /busybox/
+COPY --from=1 /distroless/bazel-bin/experimental/busybox/busybox/ /busybox/
 # Declare /busybox as a volume to get it automatically whitelisted
 VOLUME /busybox
 COPY files/ca-certificates.crt /kaniko/ssl/certs/

From c0b7ef33d5b06bf5eb5665684fa853a936c63bf8 Mon Sep 17 00:00:00 2001
From: slmagus <slmagus>
Date: Wed, 16 Oct 2019 12:03:42 -0400
Subject: [PATCH 4/4] revert distroless repo from testing fork

---
 deploy/Dockerfile_debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index 39097c1ce..c1e4107f7 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -29,7 +29,7 @@ RUN make && make out/warmer
 
 # Stage 1: Get the busybox shell
 FROM gcr.io/cloud-builders/bazel:latest
-RUN git clone https://github.com/slmagus/distroless.git
+RUN git clone https://github.com/GoogleContainerTools/distroless.git
 WORKDIR /distroless
 RUN bazel build //experimental/busybox:busybox_tar
 RUN tar -C /distroless/bazel-bin/experimental/busybox/ -xf /distroless/bazel-bin/experimental/busybox/busybox.tar