From 6acffda8bf9d46890484082af574dd259042c0b0 Mon Sep 17 00:00:00 2001
From: Christian Glombek <cglombek@redhat.com>
Date: Fri, 18 Jun 2021 23:24:13 +0200
Subject: [PATCH 1/2] images/git: Update alpine base

---
 images/git/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/git/Dockerfile b/images/git/Dockerfile
index f1c9b950f07f..1f81d6093f87 100644
--- a/images/git/Dockerfile
+++ b/images/git/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/k8s-prow/alpine:v20200605-44f6c96
+FROM gcr.io/k8s-prow/alpine:v20210618-2814345
 
 ARG IMAGE_ARG
 ENV IMAGE=${IMAGE_ARG}

From 22146d877d7088de2988c82298c9583f12f08a8a Mon Sep 17 00:00:00 2001
From: Christian Glombek <cglombek@redhat.com>
Date: Fri, 18 Jun 2021 21:24:59 +0200
Subject: [PATCH 2/2] images/git: Build for arm64

This commit switches the builder base image used for building the git
image to `gcr.io/k8s-testimages/gcb-docker-gcloud` in order to do
multi-arch (amd64 and arm64) builds via `docker buildx build`, yielding
a multi-arch manifest.
---
 images/git/cloudbuild.yaml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/images/git/cloudbuild.yaml b/images/git/cloudbuild.yaml
index 6320c7564193..f565e03fff72 100644
--- a/images/git/cloudbuild.yaml
+++ b/images/git/cloudbuild.yaml
@@ -1,19 +1,21 @@
 steps:
-  - name: gcr.io/cloud-builders/docker
+  - name: gcr.io/k8s-testimages/gcb-docker-gcloud
+    entrypoint: /buildx-entrypoint
     args:
     - build
-    - -t
-    - gcr.io/$PROJECT_ID/git:$_GIT_TAG
+    - --tag=gcr.io/$PROJECT_ID/git:$_GIT_TAG
+    - --platform=linux/amd64,linux/arm64/v8
     - --build-arg=IMAGE_ARG=gcr.io/$PROJECT_ID/git:$_GIT_TAG
+    - --push
     - .
     dir: .
-  - name: gcr.io/cloud-builders/docker
+  - name: gcr.io/k8s-testimages/gcb-docker-gcloud
+    entrypoint: gcloud
     args:
-    - tag
+    - container
+    - images
+    - add-tag
     - gcr.io/$PROJECT_ID/git:$_GIT_TAG
     - gcr.io/$PROJECT_ID/git:latest
 substitutions:
   _GIT_TAG: '12345'
-images:
-  - 'gcr.io/$PROJECT_ID/git:$_GIT_TAG'
-  - 'gcr.io/$PROJECT_ID/git:latest'