academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Override default makefile image name and tag for release (#46)

Browse Source 
* Override default makefile image name and tag for release
This commit is contained in:
Luke J Powlett
2019-12-05 18:31:02 +00:00
committed by GitHub Enterprise
parent ffda647cdf
commit 61c909f551
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -132,8 +132,13 @@ else
endif endif
ifneq "$(RELEASE)" "$(EMPTY)" ifneq "$(RELEASE)" "$(EMPTY)"
MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server
MQ_IMAGE_DEVSERVER=ibm-mqadvanced-server-dev
MQ_TAG=$(MQ_VERSION)-$(RELEASE)-$(ARCH)
EXTRA_LABELS=--label release=$(RELEASE) EXTRA_LABELS=--label release=$(RELEASE)
endif endif
MQ_IMAGE_FULL_RELEASE_NAME=$(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)
MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG)
############################################################################### ###############################################################################
# Build targets # Build targets
@@ -277,11 +282,7 @@ build-advancedserver-host: build-advancedserver
.PHONY: build-advancedserver .PHONY: build-advancedserver
build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) command-version build-advancedserver: registry-login log-build-env downloads/$(MQ_ARCHIVE) command-version
$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER):$(MQ_TAG)"$(END))) $(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) $(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 .PHONY: build-devserver-host
build-devserver-host: build-devserver build-devserver-host: build-devserver
@@ -289,11 +290,7 @@ build-devserver-host: build-devserver
.PHONY: build-devserver .PHONY: build-devserver
build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version build-devserver: registry-login log-build-env downloads/$(MQ_ARCHIVE_DEV) command-version
$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER):$(MQ_TAG)"$(END))) $(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) $(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 .PHONY: build-advancedserver-cover
build-advancedserver-cover: registry-login command-version build-advancedserver-cover: registry-login command-version