Merge remote-tracking branch 'upstream/master' into shrink

Author: arthurbarr

server/Dockerfile

@@ -62,7 +62,4 @@ EXPOSE 1414
 # Always put the MQ data directory in a Docker volume
 VOLUME /var/mqm
 
-# Run MQ and health-checking script as the "mqm" user
-USER mqm
-
 ENTRYPOINT ["mq.sh"]

server/mq.sh

@@ -35,7 +35,10 @@ config()
 		amqmfsck /var/mqm
 		echo "----------------------------------------"
 		crtmqm -q ${MQ_QMGR_NAME} || true
-		strmqm -e CMDLEVEL=${MQ_QMGR_CMDLEVEL} || true
+                if [ ${MQ_QMGR_CMDLEVEL+x} ]; then
+                        # Enables the specified command level, then stops the queue manager
+			strmqm -e CMDLEVEL=${MQ_QMGR_CMDLEVEL} || true
+                fi
 		echo "----------------------------------------"
 	fi
 	strmqm ${MQ_QMGR_NAME}