From fa3318a273407b7a79afc3f2a676cadfaab54b09 Mon Sep 17 00:00:00 2001
From: Sam Stoelinga <sammiestoel@gmail.com>
Date: Sat, 14 Mar 2020 18:05:00 -0700
Subject: [PATCH 1/2] Make cloudbuild.yaml re-usable for anyone

Cloud build is also really useful for devs that have limited resources
to build Kaniko locally. This commit makes adds parameters to cloudbuild
to make it easy to adjust to your own project.
---
 deploy/cloudbuild.yaml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
index 44b30aa49..47a9a0ab2 100644
--- a/deploy/cloudbuild.yaml
+++ b/deploy/cloudbuild.yaml
@@ -2,18 +2,21 @@ steps:
   # First, build kaniko
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile",
-           "-t", "gcr.io/kaniko-project/executor:${COMMIT_SHA}", "."]
+           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:${COMMIT_SHA}", "."]
   # Then, we want to build kaniko:debug
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_debug",
-           "-t", "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}", "."]
+           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug-${COMMIT_SHA}", "."]
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_debug",
-           "-t", "gcr.io/kaniko-project/executor:debug", "."]
+           "-t", "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug", "."]
   # Then, we want to build the cache warmer
   - name: "gcr.io/cloud-builders/docker"
     args: ["build", "-f", "deploy/Dockerfile_warmer",
-           "-t", "gcr.io/kaniko-project/warmer:${COMMIT_SHA}", "."]
-images: ["gcr.io/kaniko-project/executor:${COMMIT_SHA}",
-         "gcr.io/kaniko-project/executor:debug-${COMMIT_SHA}",
-         "gcr.io/kaniko-project/warmer:${COMMIT_SHA}"]
+           "-t", "gcr.io/$PROJECT_ID/${_WARMER_IMAGE_NAME}:${COMMIT_SHA}", "."]
+images: ["gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:${COMMIT_SHA}",
+         "gcr.io/$PROJECT_ID/${_EXECUTOR_IMAGE_NAME}:debug-${COMMIT_SHA}",
+         "gcr.io/$PROJECT_ID/${_WARMER_IMAGE_NAME}:${COMMIT_SHA}"]
+substitutions:
+  _EXECUTOR_IMAGE_NAME: executor
+  _WARMER_IMAGE_NAME: warmer

From 1dbefa20aee7e2e154509a9c9760c3bb997fc841 Mon Sep 17 00:00:00 2001
From: Sam Stoelinga <sammiestoel@gmail.com>
Date: Mon, 16 Mar 2020 09:37:41 -0700
Subject: [PATCH 2/2] Remove .gcloudignore to get cloud build to work

Cloud build requires vendors directory to be uploaded when using a build
submitted from local directory. However .gcloudignore prevents the
vendor directory to be uploaded and causes issues.
---
 .gcloudignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .gcloudignore

diff --git a/.gcloudignore b/.gcloudignore
deleted file mode 100644
index 48b8bf907..000000000
--- a/.gcloudignore
+++ /dev/null
@@ -1 +0,0 @@
-vendor/