Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloud Build Script For Xonotic #3286

Closed
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions examples/xonotic/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,17 @@
# \_/ \__,_|_| |_|\__,_|_.__/|_|\___|___/
#

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))
root_path := $(realpath $(project_path)/../..)
image_tag = $(REPOSITORY)/xonotic-example:1.1
ifeq ($(REPOSITORY),)
image_tag := xonotic-example:1.1
else
image_tag := $(PROD_REPO)/xonotic-example:1.1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So my original thought was to do the following:

Suggested change
image_tag := $(PROD_REPO)/xonotic-example:1.1
image_tag := $(REPOSITORY)/xonotic-example:1.1

That would mean that echo-image-tag would need then to be:

echo-image-tag:
	@echo $(PROD_REPO)/$(image_tag)

Which I think is fine? WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated it as per your suggestion

endif

# _____ _
# |_ _|_ _ _ __ __ _ ___| |_ ___
Expand All @@ -52,3 +57,7 @@ gar-check:
#output the tag for this image
echo-image-tag:
@echo $(image_tag)

# build and push the xonotic image with specified tag
cloud-build:
gcloud builds submit --config=cloudbuild.yaml
51 changes: 51 additions & 0 deletions examples/xonotic/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# 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"
args:
- "bash"
- "-c"
- "echo 'FROM gcr.io/cloud-builders/docker\nRUN apt-get install make\nENTRYPOINT [\"/usr/bin/make\"]' > Dockerfile.build"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non blocking, but this could actually now use the new script element in Cloud Build:

https://cloud.google.com/build/docs/configuring-builds/run-bash-scripts

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

script block added in the steps

waitFor: ["-"]

- name: gcr.io/cloud-builders/docker
id: build-make-docker
args: ["build", "-f", "Dockerfile.build", "-t", "make-docker", "."]

# build xonotic image to GCR
- name: make-docker
id: build
dir: "."
env:
- REPOSITORY=${_REPOSITORY}
args: ["-j", "1", "build"]

# push xonotic image to GCR
- name: "make-docker"
id: push
waitFor:
- build
dir: "."
env:
- REPOSITORY=${_REPOSITORY}
args: ["-j", "1", "push"]

substitutions:
_REPOSITORY: us-docker.pkg.dev/${PROJECT_ID}/examples
timeout: 1800s
Loading