Merge pull request #75 from arthurbarr/v3

Last updates for V3

Author: parrobe

CHANGELOG.md

@@ -1,13 +1,16 @@
 # Change log
 
-## 3.0.0 (2017-xx-xx)
+## 3.0.0 (2017-06-08)
 ### Action required
-None
+* Updated to install Ubuntu `.deb` files - Any changes to the `MQ_PACKAGES` variable will now need to use the new package names (for example, "ibmmq-web" instead of "MQSeriesWeb")
 
 ### Other notable changes
 * Updated to MQ V9.0.3
+* Migrated from `amqicdir` to new official `crtmqdir` utility
 * Restructured startup scripts
-* Removed fixed UID numbers
+* Removed fixed UID numbers for developer config
+* Use HTTPS for MQ installer download
+* Reduced image size by purging 32-bit libraries
 
 ## 2.0.0 (2017-03-11)
 ### Action required

Dockerfile

@@ -14,10 +14,10 @@
 
 FROM ubuntu:16.04
 
-LABEL maintainer "Arthur Barr <arthur.barr@uk.ibm.com>"
+LABEL maintainer "Arthur Barr <arthur.barr@uk.ibm.com>, Rob Parker <PARROBE@uk.ibm.com>"
 
 # The URL to download the MQ installer from in tar.gz format
-ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev902_ubuntu_x86-64.tar.gz
+ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz
 
 # The MQ packages to install
 ARG MQ_PACKAGES="ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-web ibmmq-msg-.*"

setup-var-mqm.sh

@@ -21,13 +21,11 @@
 if [ -d "/var/mqm/qmgrs" ]; then
   # User is probably following old instructions to mount a volume into /var/mqm
   echo "Using existing MQ Data under /var/mqm"
-  /opt/mqm/bin/amqicdir -i -f
-  /opt/mqm/bin/amqicdir -s -f
+  /opt/mqm/bin/crtmqdir -a -f
 else
   if [ -L "/var/mqm" ]; then
     echo "/var/mqm is already a symlink."
-    /opt/mqm/bin/amqicdir -i -f
-    /opt/mqm/bin/amqicdir -s -f
+    /opt/mqm/bin/crtmqdir -a -f
   else
     if [ -d "/mnt/mqm/" ]; then
       DATA_DIR=/mnt/mqm/data
@@ -44,19 +42,16 @@ else
         su -c "chmod 775 ${DATA_DIR}" -l mqm
       fi
 
-      /opt/mqm/bin/amqicdir -i -f
-      /opt/mqm/bin/amqicdir -s -f
+      /opt/mqm/bin/crtmqdir -a -f
       su -c "cp -RTnv /var/mqm /mnt/mqm/data" -l mqm
 
       # Remove /var/mqm and replace with a symlink
       rm -rf /var/mqm
       ln -s ${DATA_DIR} /var/mqm
       chown -h mqm:mqm /var/mqm
     else
-      #Create the MQ data Directory
-      echo "Running amqicdir"
-      /opt/mqm/bin/amqicdir -i -f
-      /opt/mqm/bin/amqicdir -s -f
+      # Create the MQ data Directory
+      /opt/mqm/bin/crtmqdir -a -f
     fi
   fi
 fi