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

Core changes to prepare for MQ V9.0.4

Browse Source
This commit is contained in:
Arthur Barr
2017-10-30 15:48:58 +00:00
parent a8bb8084b3
commit 6195ff892e
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -121,11 +121,20 @@ define docker-build-mq
$(DOCKER) network rm build $(DOCKER) network rm build
endef endef
.PHONY: build-advancedserver # .PHONY: build-advancedserver-903
build-advancedserver: build downloads/CNJR7ML.tar.gz # 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))) $(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") $(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.3-$(DOCKER_TAG_ARCH) $(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 .PHONY: build-devserver
build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz

17
install-mq.sh
View File

@@ -42,8 +42,9 @@ apt-get install -y --no-install-recommends \
util-linux util-linux
# Download and extract the MQ installation files # Download and extract the MQ installation files
mkdir -p /tmp/mq DIR_EXTRACT=/tmp/mq
cd /tmp/mq mkdir -p ${DIR_EXTRACT}
cd ${DIR_EXTRACT}
curl -LO $MQ_URL curl -LO $MQ_URL
tar -zxvf ./*.tar.gz tar -zxvf ./*.tar.gz
@@ -59,11 +60,15 @@ apt-get autoremove -y
groupadd --system --gid 999 mqm groupadd --system --gid 999 mqm
useradd --system --uid 999 --gid mqm mqm useradd --system --uid 999 --gid mqm mqm
usermod -G mqm root 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 # Accept the MQ license
./mqlicense.sh -text_only -accept ${MQLICENSE} -text_only -accept
echo "deb [trusted=yes] file:/tmp/mq/DebianMQServer ./" > /etc/apt/sources.list.d/IBM_MQ.list echo "deb [trusted=yes] file:${DIR_DEB} ./" > /etc/apt/sources.list.d/IBM_MQ.list
# Install MQ using the DEB packages # Install MQ using the DEB packages
apt-get update apt-get update
@@ -80,7 +85,7 @@ find /opt/mqm -name '*.tar.gz' -delete
# Clean up all the downloaded files # Clean up all the downloaded files
rm -f /etc/apt/sources.list.d/IBM_MQ.list 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. # 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 # Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run