From 9cd3a65900ae6e34fe6c1493c7266ca4956c31ee Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Thu, 28 Jan 2021 10:45:04 -0800 Subject: [PATCH] fix busybox (#1557) --- deploy/Dockerfile_debug | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index 26520280f..a0f47c5ee 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -35,8 +35,7 @@ RUN GOARCH=$(cat /goarch) && CGO_ENABLED=0 && \ cd /go/src/github.com/GoogleCloudPlatform && \ git clone https://github.com/GoogleCloudPlatform/docker-credential-gcr.git && \ cd /go/src/github.com/GoogleCloudPlatform/docker-credential-gcr && \ - make deps OUT_DIR=/usr/local/bin && \ - go build -ldflags "-linkmode external -extldflags -static" -i -o /usr/local/bin/docker-credential-gcr main.go + make && cp bin/docker-credential-gcr /usr/local/bin/docker-credential-gcr # Get Amazon ECR credential helper RUN GOARCH=$(cat /goarch) && go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login && \ @@ -50,7 +49,7 @@ RUN GOARCH=$(cat /goarch) && (mkdir -p /go/src/github.com/Azure || true) && \ cd /go/src/github.com/Azure/acr-docker-credential-helper && \ git checkout a79b541f3ee761f6cc4511863ed41fb038c19464 && \ git apply < /acr.patch && \ - make && cp -f bin/linux/${GOARCH}/docker-credential-acr-linux /usr/local/bin/docker-credential-acr-linux + make && cp -f ./bin/docker-credential-acr-linux /usr/local/bin/docker-credential-acr-linux #ACR docker env credential helper RUN GOARCH=$(cat /goarch) && (mkdir -p /go/src/github.com/chrismellard || true) && \ @@ -71,7 +70,7 @@ COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/warmer /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/local/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.32.0 /bin /busybox +COPY --from=multiarch/busybox:1.32.0 /bin /busybox # Declare /busybox as a volume to get it automatically in the path to ignore VOLUME /busybox