Merge pull request #1230 from D3N14L/readd_docker_dir

Fixes #1227 - Readded the /kaniko/.docker directory
GoogleContainerTools · May 6, 2020 · 420d5e1 · 420d5e1
2 parents d8c786c + f5a8117
commit 420d5e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git 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 -p /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH}
@@ -36,6 +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/
+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
@@ -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 -p /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH} && make out/warmer
@@ -47,6 +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/
+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
@@ -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 -p /kaniko/.docker
 
 COPY . .
 RUN make GOARCH=${GOARCH} out/warmer
@@ -36,6 +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/
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 ENV HOME /root
 ENV USER /root
 ENV PATH /usr/local/bin:/kaniko