public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-21 05:47:38 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1121 from carlossg/acr-help

Browse Source 
Use the correct name for acr helper
This commit is contained in:
Tejal Desai
2020-03-17 16:06:12 -07:00
committed by GitHub
parent 0302e5150c 7d345f13d2
commit d1cf3afdce
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/Dockerfile_warmer
+4
View File
@@ -24,6 +24,9 @@ RUN docker-credential-gcr configure-docker
# Get Amazon ECR credential helper
RUN go get -u github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
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
COPY . .
RUN make GOARCH=${GOARCH} out/warmer
@@ -32,6 +35,7 @@ FROM scratch
COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/warmer /kaniko/warmer
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 /root/.docker/config.json /kaniko/.docker/config.json
ENV HOME /root