From 6195ff892ead13328dacbb4ba6fdfcfef14ae5f2 Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Mon, 30 Oct 2017 15:48:58 +0000
Subject: [PATCH] Core changes to prepare for MQ V9.0.4

---
 Makefile      | 17 +++++++++++++----
 install-mq.sh | 17 +++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index abd4551..7b715ca 100644
--- a/Makefile
+++ b/Makefile
@@ -121,11 +121,20 @@ define docker-build-mq
 	$(DOCKER) network rm build
 endef
 
-.PHONY: build-advancedserver
-build-advancedserver: build downloads/CNJR7ML.tar.gz
+# .PHONY: build-advancedserver-903
+# build-advancedserver-903: build downloads/CNJR7ML.tar.gz
+# 	$(info $(SPACER)$(shell printf $(TITLE)"Build $(DOCKER_FULL_ADVANCEDSERVER)"$(END)))
+# 	$(call docker-build-mq,$(DOCKER_FULL_ADVANCEDSERVER),Dockerfile-server,CNJR7ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.3")
+# 	$(DOCKER) tag $(DOCKER_FULL_ADVANCEDSERVER) $(DOCKER_REPO_ADVANCEDSERVER):9.0.3-$(DOCKER_TAG_ARCH)
+
+.PHONY: build-advancedserver-904
+build-advancedserver-904: build downloads/CNLE4ML.tar.gz
 	$(info $(SPACER)$(shell printf $(TITLE)"Build $(DOCKER_FULL_ADVANCEDSERVER)"$(END)))
-	$(call docker-build-mq,$(DOCKER_FULL_ADVANCEDSERVER),Dockerfile-server,CNJR7ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.3")
-	$(DOCKER) tag $(DOCKER_FULL_ADVANCEDSERVER) $(DOCKER_REPO_ADVANCEDSERVER):9.0.3-$(DOCKER_TAG_ARCH)
+	$(call docker-build-mq,$(DOCKER_FULL_ADVANCEDSERVER),Dockerfile-server,CNLE4ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.4")
+	$(DOCKER) tag $(DOCKER_FULL_ADVANCEDSERVER) $(DOCKER_REPO_ADVANCEDSERVER):9.0.4-$(DOCKER_TAG_ARCH)
+
+.PHONY: build-advancedserver
+build-advancedserver: build-advancedserver-904
 
 .PHONY: build-devserver
 build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
diff --git a/install-mq.sh b/install-mq.sh
index 82973fa..47c7fc6 100644
--- a/install-mq.sh
+++ b/install-mq.sh
@@ -42,8 +42,9 @@ apt-get install -y --no-install-recommends \
   util-linux
 
 # Download and extract the MQ installation files
-mkdir -p /tmp/mq
-cd /tmp/mq
+DIR_EXTRACT=/tmp/mq
+mkdir -p ${DIR_EXTRACT} 
+cd ${DIR_EXTRACT}
 curl -LO $MQ_URL
 tar -zxvf ./*.tar.gz
 
@@ -59,11 +60,15 @@ apt-get autoremove -y
 groupadd --system --gid 999 mqm
 useradd --system --uid 999 --gid mqm mqm
 usermod -G mqm root
-cd /tmp/mq/DebianMQServer
+
+# Find directory containing .deb files
+DIR_DEB=$(find ${DIR_EXTRACT} -name "*.deb" -printf "%h\n" | sort -u | head -1)
+# Find location of mqlicense.sh
+MQLICENSE=$(find ${DIR_EXTRACT} -name "mqlicense.sh")
 
 # Accept the MQ license
-./mqlicense.sh -text_only -accept
-echo "deb [trusted=yes] file:/tmp/mq/DebianMQServer ./" > /etc/apt/sources.list.d/IBM_MQ.list
+${MQLICENSE} -text_only -accept
+echo "deb [trusted=yes] file:${DIR_DEB} ./" > /etc/apt/sources.list.d/IBM_MQ.list
 
 # Install MQ using the DEB packages
 apt-get update
@@ -80,7 +85,7 @@ find /opt/mqm -name '*.tar.gz' -delete
 
 # Clean up all the downloaded files
 rm -f /etc/apt/sources.list.d/IBM_MQ.list
-rm -rf /tmp/mq
+rm -rf ${DIR_EXTRACT}
 
 # Apply any bug fixes not included in base Ubuntu or MQ image.
 # Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run