From 5b3afb447b0b009bb33ff0968712f0a6c53ad3bb Mon Sep 17 00:00:00 2001 From: Daniel Marks Date: Tue, 5 May 2020 11:45:43 +0200 Subject: [PATCH] Readded the /kaniko/.docker directory This directory was implicitly removed with commit 8a020010b75852d5180f20f768fd09458175fd46 and breaks several peoples builds as some examples and documentation expect the directory to exist. --- deploy/Dockerfile | 2 ++ deploy/Dockerfile_debug | 2 ++ deploy/Dockerfile_warmer | 2 ++ 3 files changed, 6 insertions(+) diff --git a/deploy/Dockerfile b/deploy/Dockerfile index ec7fdb219..03f9bb9c1 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -36,6 +36,8 @@ 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 ENV HOME /root ENV USER /root ENV PATH /usr/local/bin:/kaniko diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index afec3d477..474549a75 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -47,6 +47,8 @@ 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 ENV HOME /root ENV USER /root ENV PATH /usr/local/bin:/kaniko:/busybox diff --git a/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer index f5ce66203..1d0ebbadd 100644 --- a/deploy/Dockerfile_warmer +++ b/deploy/Dockerfile_warmer @@ -36,6 +36,8 @@ 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 ENV HOME /root ENV USER /root ENV PATH /usr/local/bin:/kaniko