From 254ba7be68335630ed082173194b08c38768825e Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 7 May 2020 19:31:25 -0700 Subject: [PATCH 1/5] add 64 busybox --- deploy/Dockerfile_debug | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 725b0467a..b842c9597 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -46,6 +46,9 @@ 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 --from=1 /distroless/bazel-bin/experimental/busybox/busybox/ /busybox/ +# Workaround See #https://github.com/GoogleContainerTools/kaniko/issues/656#issuecomment-564035645 +COPY --from=amd64/busybox:1.31.0 /bin/busybox /busybox/busybox + # Declare /busybox as a volume to get it automatically whitelisted VOLUME /busybox COPY files/ca-certificates.crt /kaniko/ssl/certs/ From ba0cb81823879b8c824716cd45331ca8e46c294c Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Wed, 20 May 2020 01:00:55 -0700 Subject: [PATCH 2/5] Update Dockerfile_debug --- deploy/Dockerfile_debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index b842c9597..77821495b 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -47,7 +47,7 @@ COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux- COPY --from=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr COPY --from=1 /distroless/bazel-bin/experimental/busybox/busybox/ /busybox/ # Workaround See #https://github.com/GoogleContainerTools/kaniko/issues/656#issuecomment-564035645 -COPY --from=amd64/busybox:1.31.0 /bin/busybox /busybox/busybox +COPY --from=amd64/busybox:1.31.1 /bin/busybox /busybox/busybox # Declare /busybox as a volume to get it automatically whitelisted VOLUME /busybox From c0f699d3f15074ceabc25907ccc1a6819d15a7aa Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 4 Jun 2020 11:59:41 -0700 Subject: [PATCH 3/5] removed ununsed stage 1 --- deploy/Dockerfile_debug | 7 ------- 1 file changed, 7 deletions(-) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index fa2952dbf..1e8374f82 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -33,13 +33,6 @@ RUN mkdir -p /kaniko/.docker COPY . . RUN make GOARCH=${GOARCH} && 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 -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 - 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 From 2214da37e282a4ff81c7e7106576953372c7797b Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 4 Jun 2020 12:11:15 -0700 Subject: [PATCH 4/5] Update Dockerfile_debug --- deploy/Dockerfile_debug | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 1e8374f82..88a248de2 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -38,7 +38,6 @@ 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=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr -COPY --from=1 /distroless/bazel-bin/experimental/busybox/busybox/ /busybox/ COPY --from=amd64/busybox:1.31.1 /bin/busybox /busybox/busybox # Declare /busybox as a volume to get it automatically in the path to ignore From 9ec838bd9b30fd040b1e1f9443fdc0147f548513 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 4 Jun 2020 12:53:40 -0700 Subject: [PATCH 5/5] copy all files from busybox image --- deploy/Dockerfile_debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 88a248de2..0d1726f40 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -38,7 +38,7 @@ 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=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr -COPY --from=amd64/busybox:1.31.1 /bin/busybox /busybox/busybox +COPY --from=amd64/busybox:1.31.1 /bin /busybox # Declare /busybox as a volume to get it automatically in the path to ignore VOLUME /busybox