From 37601187b2ce69f163f78e97ac48c7f721c5d586 Mon Sep 17 00:00:00 2001 From: Luke Powlett Date: Fri, 11 Oct 2019 10:26:41 +0100 Subject: [PATCH] Removed release from makefile, will be set on internal build only --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d5570b4..254798a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ # MQ_VERSION is the fully qualified MQ version number to build MQ_VERSION ?= 9.1.3.0 # RELEASE shows what release of the container code has been built -RELEASE ?= 2 # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can # be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture # Does not apply to MQ Advanced for Developers. @@ -200,12 +199,12 @@ define build-mq --label version=$(MQ_VERSION) \ --label name=$1 \ --label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \ - --label release="$(RELEASE)" \ --label architecture="$(ARCH)" \ --label run="docker run -d -e LICENSE=accept $1:$2" \ --label vcs-ref=$(IMAGE_REVISION) \ --label vcs-type=git \ --label vcs-url=$(IMAGE_SOURCE) \ + $(EXTRA_LABELS) \ --target $5 \ . $(if $(findstring docker,$(COMMAND)), @docker kill $(BUILD_SERVER_CONTAINER))