Merge pull request #193 from tdolby-at-uk-ibm-com/master

MQ client sample updates

Author: IBMRob

samples/mqclient/Dockerfile

@@ -1,4 +1,4 @@
-ARG  FROMIMAGE=cp.icr.io/cp/appc/ace:12.0.4.0-r1
+ARG  FROMIMAGE=cp.icr.io/cp/appc/ace:12.0.8.0-r1
 FROM ${FROMIMAGE}
 
 USER root
@@ -27,4 +27,4 @@ RUN chmod u+x /usr/local/bin/install-*.sh \
 
 ENV MQCERTLABL=aceclient
 
-USER 1001
+USER 1001

samples/mqclient/README.md

@@ -9,20 +9,22 @@
 
 First [build the ACE image](../../README.md#Building-a-container-image) or obtain one of the shipped images.
 
-Download a copy of the MQ redistributable client Example URL: https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.2.0.4-IBM-MQC-Redist-LinuxX64.tar.gz
+Determine the link for the version of the MQ client to be used, using FixCentral or the standard redistributable
+client download site. An example URL would be https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.3.2.0-IBM-MQC-Redist-LinuxX64.tar.gz
+for the client.
 
-In the `sample/mqclient` folder:
+In this folder, run the docker command as follows (replacing the product version and MQ link as appropriate):
 
 ```bash
-docker build -t aceapp --build-arg FROMIMAGE=ace:12.0.4.0-r1 --build-arg MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.2.0.4-IBM-MQC-Redist-LinuxX64.tar.gz --file Dockerfile .
+docker build -t aceapp --build-arg FROMIMAGE=cp.icr.io/cp/appc/ace:12.0.8.0-r1 --build-arg MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.3.2.0-IBM-MQC-Redist-LinuxX64.tar.gz --file Dockerfile .
 ```
 
 ## Running the sample
 
 To run the container, launch the pod using a command such as:
 
 ```bash
-`docker run -d -p 7600:7600 -p 7800:7800 -e LICENSE=accept aceapp`
+docker run -d -p 7600:7600 -p 7800:7800 -e LICENSE=accept aceapp
 ```
 
-This wll then start an IntegrationServer with a MQ Client installed.
+This wll then start an IntegrationServer with the MQ Client installed.

samples/mqclient/install-mq.sh

@@ -36,9 +36,13 @@ if [ -f "${DIR_TMP}/bin/genmqpkg.sh" ]
 then 
   # Generate MQ package in INSTALLATION_DIR
   # 
-  # Used if the downloaded package is the MQ redistributable client. Example URL:
-  #    
-  # https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.2.0.4-IBM-MQC-Redist-LinuxX64.tar.gz
+  # Used if the downloaded package is the MQ redistributable client package from FixCentral. Example URL:
+  #
+  # https://ak-delivery04-mul.dhe.ibm.com/sdfdl/v2/sar/CM/WS/0b41k/0/Xa.2/Xb.juSYLTSp44S03gmhuuKNya5CV2_SpQJ-2LPjgK-iHtqctHmMpcuW1gX5kas/Xc.CM/WS/0b41k/0/9.3.1.1-IBM-MQC-Redist-LinuxX64.tar.gz/Xd./Xf.LPR.D1VK/Xg.12236559/Xi.habanero/XY.habanero/XZ.0CQLlyfoENy06FxypR3Q8j0XiSzkn_t0/9.3.1.1-IBM-MQC-Redist-LinuxX64.tar.gz  
+  #
+  # or directly from
+  #
+  # https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/9.3.2.0-IBM-MQC-Redist-LinuxX64.tar.gz
   #
   echo "Detected genmqpkg.sh; installing MQ client components"
   export genmqpkg_inc32=0
@@ -80,12 +84,12 @@ else
   fi
   # 
   # Used if the downloaded package is the MQ client package from FixCentral. Example URL:
-  #    
-  # https://ak-delivery04-mul.dhe.ibm.com/sdfdl/v2/sar/CM/WS/0a3ih/0/Xa.2/Xb.jusyLTSp44S0BnrSUlhcQXsmOX33PXiMu_opTWF4XkF7jFZV8UxrP0RFSE0/Xc.CM/WS/0a3ih/0/9.2.0.4-IBM-MQC-LinuxX64.tar.gz/Xd./Xf.LPR.D1VK/Xg.11634360/Xi.habanero/XY.habanero/XZ.m7uIgNXpo_VTCGzC-hylOC79m0eKS5pi/9.2.0.4-IBM-MQC-LinuxX64.tar.gz
+  #
+  # https://ak-delivery04-mul.dhe.ibm.com/sdfdl/v2/sar/CM/WS/0b41a/0/Xa.2/Xb.jusyLTSp44S03gmhUUKWLqYocJ4a4bPB68Y8a4ir1VLbUn2OCPlMcoPXCfk/Xc.CM/WS/0b41a/0/9.3.1.1-IBM-MQC-LinuxX64.tar.gz/Xd./Xf.LPR.D1VK/Xg.12236562/Xi.habanero/XY.habanero/XZ.vr1ZpkKu0T03LhrAVMoMz9ec8315viqv/9.3.1.1-IBM-MQC-LinuxX64.tar.gz
   # 
   # Also used if the downloaded package is the full MQ developer package. Example URL:
   #
-  # https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev924_linux_x86-64.tar.gz
+  # https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev932_linux_x86-64.tar.gz
   #
   echo "Did not find genmqpkg.sh; installing MQ client components using rpm"
   $RPM && DIR_RPM=$(find ${DIR_TMP} -name "*.rpm" -printf "%h\n" | sort -u | head -1)
@@ -106,4 +110,4 @@ fi
 rm -rf ${DIR_TMP}
 
 # Create the directory for MQ configuration files
-install --directory --mode 2775 --owner 1001 --group root /etc/mqm
+install --directory --mode 2775 --owner 1001 --group root /etc/mqm