cloudbuild.yaml: Drop unnecessary variables

Signed-off-by: Stephen Augustus <[email protected]>

Author: justaugustus

Makefile

@@ -26,9 +26,6 @@ IMG_NAME = publishing-bot
 
 IMG_VERSION ?= v0.0.0-1
 
-BUILD_ARGS = --build-arg=GIT_TAG=$(GIT_TAG) \
-			 --build-arg=IMG_VERSION=$(IMG_VERSION)
-
 # TODO(image): Consider renaming this variable
 DOCKER_REPO ?= $(IMG_REGISTRY)/$(IMG_NAME)
 NAMESPACE ?=
@@ -60,7 +57,6 @@ build-image: build
 		-t $(DOCKER_REPO):$(GIT_TAG) \
 		-t $(DOCKER_REPO):$(IMG_VERSION) \
 		-t $(DOCKER_REPO):latest \
-		$(BUILD_ARGS) \
 		.
 .PHONY: build-image
 

cloudbuild.yaml

@@ -13,10 +13,10 @@ 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"
+  - 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
 
@@ -33,7 +33,7 @@ substitutions:
   # vYYYYMMDD-hash, and can be used as a substitution
   _GIT_TAG: '12345'
   _PULL_BASE_REF: 'dev'
-  _IMG_REGISTRY: 'registry'
+  _IMG_REGISTRY: 'null-registry'
   _IMG_VERSION: 'v0.0.0-1'
 
 tags: