From 64d6bbbbc2aac9e233b07afc6a95ecb4666da023 Mon Sep 17 00:00:00 2001
From: Raffaele Di Fazio <difazio.raffaele@gmail.com>
Date: Sat, 18 Mar 2023 23:07:24 +0100
Subject: [PATCH] fix cloudbuild

Signed-off-by: Raffaele Di Fazio <difazio.raffaele@gmail.com>
---
 Makefile        | 2 --
 cloudbuild.yaml | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 58b091570..5939e50c8 100644
--- a/Makefile
+++ b/Makefile
@@ -174,9 +174,7 @@ clean:
 .PHONY: release.staging
 
 release.staging: test
-	apk add musl-dev gcc
 	IMAGE=$(IMAGE_STAGING) $(MAKE) build.push/multiarch
 
 release.prod: test
-	apk add musl-dev gcc
 	$(MAKE) build.push/multiarch
\ No newline at end of file
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 1062c582d..856807017 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -4,13 +4,16 @@ options:
   substitution_option: ALLOW_LOOSE
 steps:
   - name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20230206-8160eea68e"
-    entrypoint: make
+    entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
       - VERSION=$_GIT_TAG
       - PULL_BASE_REF=$_PULL_BASE_REF
     args:
-      - release.staging
+      - -c
+      - |
+        apk add musl-dev gcc
+        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