Merge pull request kubernetes-sigs#1361 from linki/fix/add-version-to…

…-binary

Add version to binary for --version flag

Dockerfile

@@ -15,6 +15,8 @@
 # builder image
 FROM golang:1.13 as builder
 
+ARG VERSION
+
 WORKDIR /sigs.k8s.io/external-dns
 
 COPY . .

Makefile

@@ -60,10 +60,10 @@ build.push: build.docker
 	docker push "$(IMAGE):$(VERSION)"
 
 build.docker:
-	docker build --rm --tag "$(IMAGE):$(VERSION)" .
+	docker build --rm --tag "$(IMAGE):$(VERSION)" --build-arg VERSION="$(VERSION)" .
 
 build.mini:
-	docker build --rm --tag "$(IMAGE):$(VERSION)-mini" -f Dockerfile.mini .
+	docker build --rm --tag "$(IMAGE):$(VERSION)-mini" --build-arg VERSION="$(VERSION)" -f Dockerfile.mini .
 
 clean:
 	@rm -rf build
@@ -72,7 +72,7 @@ clean:
 .PHONY: release.staging
 
 release.staging:
-	IMAGE=$(IMAGE_STAGING) VERSION=$(TAG) $(MAKE) build.docker build.push
+	IMAGE=$(IMAGE_STAGING) $(MAKE) build.docker build.push
 
 release.prod:
 	$(MAKE) build.docker build.push

cloudbuild.yaml

@@ -7,7 +7,7 @@ steps:
     entrypoint: make
     env:
       - DOCKER_CLI_EXPERIMENTAL=enabled
-      - TAG=$_GIT_TAG
+      - VERSION=$_GIT_TAG
       - PULL_BASE_REF=$_PULL_BASE_REF
     args:
       - release.staging