Merge pull request #273 from justaugustus/img-build

Add GCB config for image building

Author: k8s-ci-robot

Makefile

@@ -18,7 +18,16 @@ all: build
 -include $(CONFIG)
 -include $(CONFIG)-token
 
-DOCKER_REPO ?= k8s-publishing-bot
+GIT_TAG ?= $(shell git describe --tags --always --dirty)
+
+# Image variables
+IMG_REGISTRY ?= gcr.io/k8s-staging-publishing-bot
+IMG_NAME = publishing-bot
+
+IMG_VERSION ?= v0.0.0-1
+
+# TODO(image): Consider renaming this variable
+DOCKER_REPO ?= $(IMG_REGISTRY)/$(IMG_NAME)
 NAMESPACE ?=
 TOKEN ?=
 KUBECTL ?= kubectl
@@ -44,12 +53,21 @@ build:
 .PHONY: build
 
 build-image: build
-	docker build -t $(DOCKER_REPO) .
+	docker build \
+		-t $(DOCKER_REPO):$(GIT_TAG) \
+		-t $(DOCKER_REPO):$(IMG_VERSION) \
+		-t $(DOCKER_REPO):latest \
+		.
 .PHONY: build-image
 
 push-image:
+	docker push $(DOCKER_REPO):$(GIT_TAG)
+	docker push $(DOCKER_REPO):$(IMG_VERSION)
 	docker push $(DOCKER_REPO):latest
 
+build-and-push-image: build-image push-image
+.PHONY: build-and-push-image
+
 clean:
 	rm -rf _output
 .PHONY: clean

cloudbuild.yaml

@@ -0,0 +1,49 @@
+# Google Cloud Build configuration: https://cloud.google.com/cloud-build/docs/build-config
+# Image building process: https://git.k8s.io/test-infra/config/jobs/image-pushing/README.md
+
+# this must be specified in seconds. If omitted, defaults to 600s (10 mins)
+timeout: 1200s
+
+options:
+  substitution_option: ALLOW_LOOSE
+  # TODO(image): Consider a smaller machine type
+  machineType: N1_HIGHCPU_32
+
+steps:
+- name: 'gcr.io/k8s-staging-releng/k8s-ci-builder:latest-default'
+  entrypoint: make
+  env:
+  - GIT_TAG=$_GIT_TAG
+  - PULL_BASE_REF=$_PULL_BASE_REF
+  - IMG_REGISTRY=gcr.io/$PROJECT_ID
+  - IMG_VERSION=$_IMG_VERSION
+  args:
+  - build-and-push-image
+
+# TODO(image): Consider adding a container structure test
+#- name: 'gcr.io/gcp-runtimes/container-structure-test'
+#  id: structure-test
+#  args:
+#  - test
+#  - --image=gcr.io/$PROJECT_ID/publishing-bot:$_GIT_TAG
+#  - --config=container-structure.yaml
+
+substitutions:
+  # _GIT_TAG will be filled with a git-based tag for the image, of the form
+  # vYYYYMMDD-hash, and can be used as a substitution
+  _GIT_TAG: '12345'
+  _PULL_BASE_REF: 'dev'
+  _IMG_REGISTRY: 'null-registry'
+  _IMG_VERSION: 'v0.0.0-1'
+
+tags:
+- 'publishing-bot'
+- ${_GIT_TAG}
+- ${_PULL_BASE_REF}
+- ${_IMG_REGISTRY}
+- ${_IMG_VERSION}
+
+images:
+- 'gcr.io/$PROJECT_ID/publishing-bot:$_GIT_TAG'
+- 'gcr.io/$PROJECT_ID/publishing-bot:$_IMG_VERSION'
+- 'gcr.io/$PROJECT_ID/publishing-bot:latest'