Fix gcloud auth required for image push (#1230)

Signed-off-by: Prajyot-Parab <[email protected]>
kubernetes-sigs · May 16, 2023 · 43540a5 · 43540a5
1 parent fc8fa51
commit 43540a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -4,15 +4,18 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230424-910a2a439d'
-    entrypoint: make
+    entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
       - TAG=$_GIT_TAG
       - PULL_BASE_REF=$_PULL_BASE_REF
       - DOCKER_BUILDKIT=1
       - HOME=/root
     args:
-      - release-staging
+    - -c
+    - |
+      gcloud auth configure-docker \
+      && make release-staging
 substitutions:
   # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and
   # can be used as a substitution

diff --git a/hack/init-buildx.sh b/hack/init-buildx.sh
@@ -47,5 +47,5 @@ if [ "$(uname)" == 'Linux' ]; then
 fi
 
 # Ensure we use a builder that can leverage it (the default on linux will not)
-docker buildx rm capibm || true
+docker buildx rm capibm >/dev/null 2>&1 || true
 docker buildx create --use --name=capibm