From 330e2aedd412e9c4266055f9caefde58b9d1f24c Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Thu, 25 Jun 2020 14:03:34 -0400
Subject: [PATCH] Test trigger of cloudbuild for nginx image

---
 images/nginx/Makefile        | 13 ++++++++++---
 images/nginx/cloudbuild.yaml |  2 --
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/images/nginx/Makefile b/images/nginx/Makefile
index 6766b465a..cd0f300bc 100644
--- a/images/nginx/Makefile
+++ b/images/nginx/Makefile
@@ -15,12 +15,13 @@
 .DEFAULT_GOAL:=build
 
 # set default shell
-SHELL=/bin/bash
+SHELL=/bin/bash -o pipefail -o errexit
 
 DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
+INIT_BUILDX=$(DIR)/../../hack/init-buildx.sh
 
 # 0.0.0 shouldn't clobber any released builds
-TAG ?= 0.106
+TAG ?= 0.105
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 
 IMAGE = $(REGISTRY)/nginx
@@ -45,6 +46,12 @@ push: build
 
 # enable buildx
 ensure-buildx:
-	$(DIR)/../../hack/init-buildx.sh
+# this is required for cloudbuild
+ifeq ("$(wildcard $(INIT_BUILDX))","")
+	@curl -sSL https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/hack/init-buildx.sh | bash
+else
+	@exec $(INIT_BUILDX)
+endif
+	@echo "done"
 
 .PHONY: build push ensure-buildx
diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
index b4099e335..4ecd8981c 100644
--- a/images/nginx/cloudbuild.yaml
+++ b/images/nginx/cloudbuild.yaml
@@ -16,8 +16,6 @@ steps:
     - -c
     - |
       gcloud auth configure-docker \
-      && pwd \
-      && ls -lat \
       && make build push
 substitutions:
   _GIT_TAG: "12345"