From 3c6ed4537b312de59a4886a7382f46fa9ab2a002 Mon Sep 17 00:00:00 2001
From: ericzzzzzzz <102683393+ericzzzzzzz@users.noreply.github.com>
Date: Thu, 1 Jun 2023 10:45:04 -0400
Subject: [PATCH] chore: update release build script to support internal
 scanning (#8834)

---
 Makefile                           | 2 ++
 deploy/cloudbuild-release-lts.yaml | 1 +
 deploy/cloudbuild.yaml             | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index c7bdd1de85a..5c660575369 100644
--- a/Makefile
+++ b/Makefile
@@ -166,6 +166,7 @@ release-build:
 		-f deploy/skaffold/Dockerfile \
 		--target release \
 		-t gcr.io/$(GCP_PROJECT)/skaffold:edge \
+		-t gcr.io/$(GCP_PROJECT)/skaffold:public-image-edge \
 		-t gcr.io/$(GCP_PROJECT)/skaffold:$(COMMIT) \
 		.
 
@@ -177,6 +178,7 @@ release-lts: $(BUILD_DIR)/VERSION
 		--target release \
 		-t gcr.io/$(GCP_PROJECT)/skaffold:lts \
 		-t gcr.io/$(GCP_PROJECT)/skaffold:$(VERSION)-lts \
+		-t gcr.io/$(GCP_PROJECT)/skaffold:$(SCANNING_MARKER)-lts \
 		.
 
 .PHONY: release-slim
diff --git a/deploy/cloudbuild-release-lts.yaml b/deploy/cloudbuild-release-lts.yaml
index a250ee255e5..465f18342c8 100644
--- a/deploy/cloudbuild-release-lts.yaml
+++ b/deploy/cloudbuild-release-lts.yaml
@@ -49,6 +49,7 @@ steps:
     - 'make'
     - 'release-lts'
     - 'VERSION=$TAG_NAME'
+    - 'SCANNING_MARKER=$_SCANNING_MARKER'
     - 'RELEASE_BUCKET=$_RELEASE_BUCKET'
     - 'GCP_PROJECT=$PROJECT_ID'
 
diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
index 37247e5f15c..ee090ba562c 100644
--- a/deploy/cloudbuild.yaml
+++ b/deploy/cloudbuild.yaml
@@ -57,6 +57,7 @@ steps:
 images:
 - 'gcr.io/$PROJECT_ID/build_deps:latest'
 - 'gcr.io/$PROJECT_ID/skaffold:edge'
+- 'gcr.io/$PROJECT_ID/skaffold:public-image-edge'
 - 'gcr.io/$PROJECT_ID/skaffold:$COMMIT_SHA'
 - 'us-east1-docker.pkg.dev/$PROJECT_ID/scanning/skaffold:edge'