From 85d0dbd045b58b90740a882f185a7b5ceabd6247 Mon Sep 17 00:00:00 2001 From: Roman Gorshunov Date: Wed, 24 Oct 2018 15:55:12 +0200 Subject: [PATCH] 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: I97fd1c44c31a8a815cc6873c5fd9de8e772ea226 --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c25a124c..5ede898f 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,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 ?= $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG) PYTHON_BASE_IMAGE ?= python:3.6 export @@ -63,7 +65,7 @@ format: py_format .PHONY: build_pegleg build_pegleg: ifeq ($(USE_PROXY), true) - docker build -t $(IMAGE) --network=host \ + docker build -t $(IMAGE) --network=host --label $(LABEL) \ --label "org.opencontainers.image.revision=$(COMMIT)" \ --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ --label "org.opencontainers.image.title=$(IMAGE_NAME)" \ @@ -77,7 +79,7 @@ ifeq ($(USE_PROXY), true) --build-arg NO_PROXY=$(NO_PROXY) \ --build-arg ctx_base=$(PEGLEG_BUILD_CTX) . else - docker build -t $(IMAGE) --network=host \ + docker build -t $(IMAGE) --network=host --label $(LABEL) \ --label "org.opencontainers.image.revision=$(COMMIT)" \ --label "org.opencontainers.image.created=$(shell date --rfc-3339=seconds --utc)" \ --label "org.opencontainers.image.title=$(IMAGE_NAME)" \