Merge pull request #236 from oreillymedia/gcloud-fix-and-arch

fix(Dockerfile.alpine): gcloud auth naming and targetarch from alpine
estesp · Nov 1, 2023 · 4262c21 · 4262c21
2 parents cfdd696 + b676b43
commit 4262c21
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hack/Dockerfile.alpine b/hack/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM golang:1.21.3-alpine AS bld
+FROM --platform=$TARGETARCH golang:1.21.3-alpine AS bld
 ARG TARGETPLATFORM
 ARG TARGETARCH
 ARG TARGETVARIANT
@@ -22,7 +22,7 @@ RUN /manifest-tool/hack/makestatic.sh $TARGETARCH ${TARGETVARIANT#v}
 FROM alpine:3.17.0
 COPY --from=bld /manifest-tool/manifest-tool /manifest-tool
 COPY --from=bld /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
-COPY --from=bld --chown=0:0 /go/bin/docker-credential-gcr /usr/bin/docker-credential-gcr
+COPY --from=bld --chown=0:0 /go/bin/docker-credential-gcr /usr/bin/docker-credential-gcloud
 COPY --from=bld --chown=0:0 /go/bin/docker-credential-ecr-login /usr/bin/docker-credential-ecr-login
 COPY --from=bld --chown=0:0 /go/bin/docker-credential-acr-env /usr/bin/docker-credential-acr-env
 ENV PATH="${PATH}:/"