From ffda647cdf5974b85af15cadfdff9458b4ec9a97 Mon Sep 17 00:00:00 2001
From: Luke J Powlett <Luke.Powlett@ibm.com>
Date: Thu, 5 Dec 2019 16:07:11 +0000
Subject: [PATCH] Fixed docker images labels (#45)

---
 Makefile | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Makefile b/Makefile
index 68411b3..3888e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,10 @@ else
 	MQ_DELIVERY_REGISTRY_FULL_PATH=$(MQ_DELIVERY_REGISTRY_HOSTNAME)
 endif
 
+ifneq "$(RELEASE)" "$(EMPTY)"
+	EXTRA_LABELS=--label release=$(RELEASE)
+endif
+
 ###############################################################################
 # Build targets
 ###############################################################################
@@ -273,7 +277,11 @@ build-advancedserver-host: build-advancedserver
 .PHONY: build-advancedserver
 build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) command-version
 	$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)"$(END)))
+ifeq "$(RELEASE)" "$(EMPTY)"
 	$(call build-mq,$(MQ_IMAGE_ADVANCEDSERVER),$(MQ_TAG),Dockerfile-server,$(MQ_ARCHIVE),mq-server)
+else
+	$(call build-mq,ibm-mqadvanced-server,$(MQ_VERSION)-$(RELEASE)-$(ARCH),Dockerfile-server,$(MQ_ARCHIVE),mq-server)
+endif
 
 .PHONY: build-devserver-host
 build-devserver-host: build-devserver
@@ -281,7 +289,11 @@ build-devserver-host: build-devserver
 .PHONY: build-devserver
 build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version 
 	$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)"$(END)))
+ifeq "$(RELEASE)" "$(EMPTY)"
 	$(call build-mq,$(MQ_IMAGE_DEVSERVER),$(MQ_TAG),Dockerfile-server,$(MQ_ARCHIVE_DEV),mq-dev-server)
+else
+	$(call build-mq,ibm-mqadvanced-server-dev,$(MQ_VERSION)-$(RELEASE)-$(ARCH),Dockerfile-server,$(MQ_ARCHIVE_DEV),mq-dev-server)
+endif
 
 .PHONY: build-advancedserver-cover
 build-advancedserver-cover: registry-login command-version