Fix: adding back the possibility to add arbitrary labels

Arbitrary labels could be added as `make` parameter `LABEL=`, which is used in
att-comdev/cicd Jenkins pipelines.

Sample parameter:
'LABEL=org.label-schema.vcs-url=${GERRIT_CHANGE_URL} \
--label org.label-schema.base-image=${base_sha256}'

Sample usage:
See Jenkinsfile files under images/ directory in att-comdev/cicd repo.

In addition to that, if `COMMIT` variable is undefined when invoking `make`, we
use result of `git rev-parse HEAD` command, which should output latest git
commit ID.

[0] https://github.com/att-comdev/cicd

Change-Id: Ibd4921de87b2d9cbf094c7f3378a56df470accae

1 files changed, 5 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 949a1ed..14fd1c1 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,9 @@ PROXY             ?= http://proxy.foo.com:8000
 NO_PROXY          ?= localhost,127.0.0.1,.svc.cluster.local
 USE_PROXY         ?= false
 PUSH_IMAGE        ?= false
-COMMIT            ?= commit-id
+# use this variable for image labels added in internal build process
+LABEL             ?= com.internal
+COMMIT            ?= $(shell git rev-parse HEAD)
 IMAGE_NAME        := maas-rack-controller maas-region-controller sstream-cache
 BUILD_DIR         := $(shell mktemp -d)
 HELM              := $(BUILD_DIR)/helm
@@ -67,7 +69,7 @@ helm-install:
 .PHONY: build
 build:
 ifeq ($(USE_PROXY), true)
-        docker build -t $(IMAGE) --network=host \
+        docker build -t $(IMAGE) --label $(LABEL) --network=host \
                 --label "org.opencontainers.image.revision=$(COMMIT)" \
                 --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
                 --label "org.opencontainers.image.title=$(IMAGE_NAME)" \
@@ -82,7 +84,7 @@ ifeq ($(USE_PROXY), true)
                 --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) \
                 $(IMAGE_DIR)
 else
-        docker build -t $(IMAGE) --network=host \
+        docker build -t $(IMAGE) --label $(LABEL) --network=host \
                 --label "org.opencontainers.image.revision=$(COMMIT)" \
                 --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \
                 --label "org.opencontainers.image.title=$(IMAGE_NAME)" \