From 40bb6c3d2ea0d3b99a4c1644d2194816fd1a5d7d Mon Sep 17 00:00:00 2001
From: James Strong <strong.james.e@gmail.com>
Date: Thu, 17 Mar 2022 15:02:41 -0400
Subject: [PATCH] update cloud build (#8349)

---
 images/nginx/cloudbuild.yaml   | 9 +++------
 images/nginx/rootfs/Dockerfile | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/images/nginx/cloudbuild.yaml b/images/nginx/cloudbuild.yaml
index d6347e437..3a646fc88 100644
--- a/images/nginx/cloudbuild.yaml
+++ b/images/nginx/cloudbuild.yaml
@@ -4,21 +4,18 @@ options:
   # job builds a multi-arch docker image for amd64,arm,arm64 and s390x.
   machineType: N1_HIGHCPU_32
 steps:
-  - name: gcr.io/k8s-staging-test-infra/image-builder:v20220309-4b32800b2d
+  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20211118-2f2d816b90'
     entrypoint: bash
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - COMMIT=$SHORT_SHA
       - BASE_REF=$_PULL_BASE_REF
       - REGISTRY=gcr.io/k8s-staging-ingress-nginx
-      # default cloudbuild has HOME=/builder/home and docker buildx is in /root/.docker/cli-plugins/docker-buildx
-      # set the home to /root explicitly to if using docker buildx
-      - HOME=/root
+       - HOME=/root
     args:
     - -c
     - |
       gcloud auth configure-docker \
-      && TAG=v$(date "+%Y%m%d")-${COMMIT} make push
+      && TAG=v$(date "+%Y%m%d")-$(git rev-parse --short HEAD) make push
 substitutions:
   _GIT_TAG: "12345"
   _PULL_BASE_REF: "master"
diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile
index d39863aec..a3c4831bb 100644
--- a/images/nginx/rootfs/Dockerfile
+++ b/images/nginx/rootfs/Dockerfile
@@ -41,7 +41,8 @@ RUN apk update \
     pcre \
     zlib \
     geoip \
-    curl ca-certificates \
+    curl \
+    ca-certificates \
     patch \
     yajl \
     lmdb \