From 373298d122373b4e42bfab2b7307f6d2724e4968 Mon Sep 17 00:00:00 2001
From: Kalaiselvi Murugesan <kalaiselvim@google.com>
Date: Thu, 27 Jul 2023 19:06:58 +0000
Subject: [PATCH 1/2] Cloud Build Script for supertuxkart

---
 examples/supertuxkart/Makefile        | 17 ++++++++---
 examples/supertuxkart/cloudbuild.yaml | 41 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 examples/supertuxkart/cloudbuild.yaml

diff --git a/examples/supertuxkart/Makefile b/examples/supertuxkart/Makefile
index 0318d99f77..a451481332 100644
--- a/examples/supertuxkart/Makefile
+++ b/examples/supertuxkart/Makefile
@@ -23,11 +23,16 @@
 #     \_/ \__,_|_|  |_|\__,_|_.__/|_|\___|___/
 #
 
-REPOSITORY = us-docker.pkg.dev/agones-images/examples
+REPOSITORY ?=
+PROD_REPO ?= us-docker.pkg.dev/agones-images/examples
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 project_path := $(dir $(mkfile_path))
-image_tag = $(REPOSITORY)/supertuxkart-example:0.8
+ifeq ($(REPOSITORY),)
+	image_tag := supertuxkart-example:0.8
+else
+	image_tag := $(REPOSITORY)/supertuxkart-example:0.8
+endif
 
 #   _____                    _
 #  |_   _|_ _ _ __ __ _  ___| |_ ___
@@ -50,8 +55,12 @@ test:
 
 # check if hosted on Google Artifact Registry
 gar-check:
-	gcloud container images describe $(image_tag)
+	gcloud container images describe $(PROD_REPO)/$(image_tag)
 
 #output the tag for this image
 echo-image-tag:
-	@echo $(image_tag)
+	@echo $(PROD_REPO)/$(image_tag)
+
+# build and push the supertuxkart image with specified tag
+cloud-build:
+	gcloud builds submit --config=cloudbuild.yaml
\ No newline at end of file
diff --git a/examples/supertuxkart/cloudbuild.yaml b/examples/supertuxkart/cloudbuild.yaml
new file mode 100644
index 0000000000..f434928f74
--- /dev/null
+++ b/examples/supertuxkart/cloudbuild.yaml
@@ -0,0 +1,41 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+  #
+  # Creates the initial make + docker build platform
+  #
+  - name: "ubuntu"
+    script: |
+      echo 'FROM gcr.io/cloud-builders/docker\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build
+  - name: gcr.io/cloud-builders/docker
+    id: build-make-docker
+    entrypoint: "docker"
+    args: ["build", "-f", "Dockerfile.build", "-t", "make-docker", "."]
+
+  # build and push supertuxkart image to GCR
+  - name: "make-docker"
+    id: push
+    dir: "."
+    env:
+      - REPOSITORY=${_REPOSITORY}
+    script: |
+      make -j 1 push
+options:
+  machineType: E2_HIGHCPU_32
+  dynamic_substitutions: true
+
+substitutions:
+  _REPOSITORY: us-docker.pkg.dev/${PROJECT_ID}/examples
+timeout: 1800s
\ No newline at end of file

From 06ed78b882466249d4471730e8ee50f885d8209e Mon Sep 17 00:00:00 2001
From: Kalaiselvi Murugesan <kalaiselvim@google.com>
Date: Wed, 2 Aug 2023 03:27:46 +0000
Subject: [PATCH 2/2] small change

---
 examples/supertuxkart/cloudbuild.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/supertuxkart/cloudbuild.yaml b/examples/supertuxkart/cloudbuild.yaml
index f434928f74..a0119b1495 100644
--- a/examples/supertuxkart/cloudbuild.yaml
+++ b/examples/supertuxkart/cloudbuild.yaml
@@ -31,9 +31,8 @@ steps:
     env:
       - REPOSITORY=${_REPOSITORY}
     script: |
-      make -j 1 push
+      make push
 options:
-  machineType: E2_HIGHCPU_32
   dynamic_substitutions: true
 
 substitutions: