From 9e7f8414d3e88de133c4f8bb1c19c03a27d95d03 Mon Sep 17 00:00:00 2001
From: Daniel Marks <daniel.marks@codecentric.de>
Date: Tue, 5 May 2020 12:11:29 +0200
Subject: [PATCH] Moved directory creation to build container.

---
 deploy/Dockerfile        | 5 +++--
 deploy/Dockerfile_debug  | 5 +++--
 deploy/Dockerfile_warmer | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
index 03f9bb9c1..712cff076 100644
--- a/deploy/Dockerfile
+++ b/deploy/Dockerfile
@@ -26,6 +26,8 @@ RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64
 # ACR docker credential helper
 ADD https://aadacr.blob.core.windows.net/acr-docker-credential-helper/docker-credential-acr-linux-amd64.tar.gz /usr/local/bin
 RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-acr-linux-amd64.tar.gz
+# Add .docker config dir
+RUN mkdir /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH}
@@ -36,8 +38,7 @@ 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=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
-# Add .docker config dir
-RUN mkdir /kaniko/.docker
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 ENV HOME /root
 ENV USER /root
 ENV PATH /usr/local/bin:/kaniko
diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
index 474549a75..2d1ec8482 100644
--- a/deploy/Dockerfile_debug
+++ b/deploy/Dockerfile_debug
@@ -27,6 +27,8 @@ RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64
 # ACR docker credential helper
 ADD https://aadacr.blob.core.windows.net/acr-docker-credential-helper/docker-credential-acr-linux-amd64.tar.gz /usr/local/bin
 RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-acr-linux-amd64.tar.gz
+# Add .docker config dir
+RUN mkdir /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH} && make out/warmer
@@ -47,8 +49,7 @@ 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/
-# Add .docker config dir
-RUN mkdir /kaniko/.docker
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 ENV HOME /root
 ENV USER /root
 ENV PATH /usr/local/bin:/kaniko:/busybox
diff --git a/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer
index 1d0ebbadd..77ac69f12 100644
--- a/deploy/Dockerfile_warmer
+++ b/deploy/Dockerfile_warmer
@@ -26,6 +26,8 @@ RUN make -C /go/src/github.com/awslabs/amazon-ecr-credential-helper linux-amd64
 # ACR docker credential helper
 ADD https://aadacr.blob.core.windows.net/acr-docker-credential-helper/docker-credential-acr-linux-amd64.tar.gz /usr/local/bin
 RUN tar -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credential-acr-linux-amd64.tar.gz
+# Add .docker config dir
+RUN mkdir /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH} out/warmer
@@ -36,8 +38,7 @@ 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=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
-# Add .docker config dir
-RUN mkdir /kaniko/.docker
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 ENV HOME /root
 ENV USER /root
 ENV PATH /usr/local/bin:/kaniko