From c2d41b9a0e5a9140d6b5e5a1c91b8a4e1d3dfb9e Mon Sep 17 00:00:00 2001
From: Danny Seymour <danny.seymour@gremlin.com>
Date: Thu, 9 Oct 2025 16:02:17 -0700
Subject: [PATCH] feat: Push built Docker images to k8s staging infra

---
 Makefile        | 12 ++++++++++--
 cloudbuild.yaml |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 42141538..2213371c 100644
--- a/Makefile
+++ b/Makefile
@@ -19,16 +19,24 @@ test:
 
 build-docker:
 	docker buildx build \
-		--output=type=docker \
+		--load \
 		--platform=linux/$(GOARCH) \
 		-t ${REPO}/${IMAGE}:latest \
 		-t ${REPO}/${IMAGE}:${TAG} \
 		--build-arg BUILDER=$(shell hack/setup-go.sh) \
 		--build-arg TAG=${TAG} .
 
+release-docker:
+	docker buildx build \
+		--push \
+		--platform=linux/amd64,linux/arm64 \
+		-t ${REPO}/${IMAGE}:latest \
+		-t ${REPO}/${IMAGE}:${TAG} \
+		--build-arg BUILDER=$(shell hack/setup-go.sh) \
+		--build-arg TAG=${TAG} .
+
 build-server:
 	TAG=${TAG} hack/build-server.sh
 
 build-client:
 	TAG=${TAG} hack/build-client.sh
-
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index c5f93b41..c1ac78ca 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -5,15 +5,15 @@ options:
   dynamic_substitutions: true
 
 steps:
-  - name: 'gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d'
+  - name: "gcr.io/k8s-staging-test-infra/gcb-docker-gcloud:v20250116-2a05ea7e3d"
     entrypoint: make
     env:
       - REPO=us-central1-docker.pkg.dev/k8s-staging-images/aws-encryption-provider
       - IMAGE=aws-encryption-provider
       - TAG=$_GIT_TAG
     args:
-      - build-docker
+      - release-docker
 
 substitutions:
-  _GIT_TAG: '12345'
-  _PULL_BASE_REF: 'master'
+  _GIT_TAG: "12345"
+  _PULL_BASE_REF: "master"