From 9dbbdd29dbdb856c389e1a3a52715956d7072402 Mon Sep 17 00:00:00 2001
From: convery <convery@uk.ibm.com>
Date: Mon, 4 Feb 2019 08:43:31 +0000
Subject: [PATCH] 11.0.0.3 update

---
 README.md                 |  8 ++--
 ace_compile_bars.sh       | 10 +++--
 ace_config_bars.sh        | 10 +++--
 ace_config_keystore.sh    | 75 +++++++++++++++++++----------------
 ace_config_odbcini.sh     |  7 +++-
 ace_config_policy.sh      | 14 ++++++-
 ace_config_serverconf.sh  |  4 +-
 ace_config_setdbparms.sh  | 35 ++++++++---------
 ace_config_truststore.sh  | 35 ++++++++++-------
 ace_config_webusers.sh    | 83 ++++++++++++++++++++++-----------------
 ace_integration_server.sh |  2 +-
 build-rhel.sh             | 49 +++++++++++++++++++++++
 build.sh                  | 44 ---------------------
 rhel/Dockerfile.acerhel   |  2 +-
 rhel/Dockerfile.build     |  2 +-
 15 files changed, 214 insertions(+), 166 deletions(-)
 create mode 100755 build-rhel.sh
 delete mode 100755 build.sh

diff --git a/README.md b/README.md
index a962a53..93ca81e 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,10 @@ Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in
 
 1. ACE production with MQ Advanced production:
    * Ubuntu: `docker build -t ace-mq --build-arg BASE_IMAGE={MQ-image} --build-arg ACE_INSTALL={ACE-file-in-deps-folder} --file ubuntu/Dockerfile.acemq .`
-   * RedHat Enterprise Linux: `./build.sh ace-mq {ACE-file-in-deps-folder} {mq-base-image-name}`
+   * RedHat Enterprise Linux: `./build-rhel.sh ace-mq {buildTag} {ACE-file-in-deps-folder} {mq-base-image-name}`
 2. ACE for Developers with MQ Advanced for Developers:
    * Ubuntu: `docker build -t ace-dev-mq-dev --build-arg ACE_INSTALL={ACE-dev-file-in-deps-folder} --file ubuntu/Dockerfile.acemq .`
-   * RedHat Enterprise Linux: `./build.sh ace-mq {ACE-file-in-deps-folder} {mq-base-image-name}`
+   * RedHat Enterprise Linux: `./build-rhel.sh ace-mq {buildTag} {ACE-file-in-deps-folder} {mq-base-image-name}`
 
 **Note:** As mentioned before, the docker file will download the **[Development version of IBM MQ](https://hub.docker.com/r/ibmcom/mq/)** by default unless `BASE_IMAGE` is changed.
 
@@ -52,10 +52,10 @@ Then set the build argument `ACE_INSTALL` to the name of the ACE file placed in
 
 1. ACE for Developers only:
    * Ubuntu: `docker build -t ace-dev-only --build-arg ACE_INSTALL={ACE-dev-file-in-deps-folder} --file ubuntu/Dockerfile.aceonly .`
-   * RedHat Enterprise Linux: `./build.sh ace-dev-only {ACE-file-in-deps-folder}`
+   * RedHat Enterprise Linux: `./build-rhel.sh ace-dev-only {buildTag} {ACE-file-in-deps-folder}`
 2. ACE production only: 
    * Ubuntu: `docker build -t ace-only --build-arg ACE_INSTALL={ACE-file-in-deps-folder} --file ubuntu/Dockerfile.aceonly .`
-   * RedHat Enterprise Linux: `./build.sh ace-only {ACE-file-in-deps-folder}`
+   * RedHat Enterprise Linux: `./build-rhel.sh ace-only {buildTag} {ACE-file-in-deps-folder}`
 
 # Usage
 
diff --git a/ace_compile_bars.sh b/ace_compile_bars.sh
index cd484cf..87eb8fc 100644
--- a/ace_compile_bars.sh
+++ b/ace_compile_bars.sh
@@ -11,7 +11,9 @@ if [ -z "$MQSI_VERSION" ]; then
   source /opt/ibm/ace-11/server/bin/mqsiprofile
 fi
 
-for bar in /home/aceuser/bars/*.bar
-do
-  mqsibar -a $bar -w /home/aceuser/ace-server
-done
+if ls /home/aceuser/bars/*.bar >/dev/null 2>&1; then
+  for bar in /home/aceuser/bars/*.bar
+  do
+    mqsibar -a $bar -w /home/aceuser/ace-server
+  done
+fi
diff --git a/ace_config_bars.sh b/ace_config_bars.sh
index cccf5d9..5cc3b17 100644
--- a/ace_config_bars.sh
+++ b/ace_config_bars.sh
@@ -11,7 +11,9 @@ if [ -z "$MQSI_VERSION" ]; then
   source /opt/ibm/ace-11/server/bin/mqsiprofile
 fi
 
-for bar in /home/aceuser/initial-config/bars/*.bar
-do
-  mqsibar -a $bar -w /home/aceuser/ace-server
-done
\ No newline at end of file
+if ls /home/aceuser/initial-config/bars/*.bar >/dev/null 2>&1; then
+  for bar in /home/aceuser/initial-config/bars/*.bar
+  do
+    mqsibar -a $bar -w /home/aceuser/ace-server
+  done
+fi
diff --git a/ace_config_keystore.sh b/ace_config_keystore.sh
index 86a49a7..32bd863 100644
--- a/ace_config_keystore.sh
+++ b/ace_config_keystore.sh
@@ -12,42 +12,49 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 
 log "Handling keystore configuration"
 
-if [ -f /home/aceuser/ace-server/keystore.jks ]; then
-  OUTPUT=$(rm /home/aceuser/ace-server/keystore.jks 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-fi
-
-IFS=$'\n'
-for keyfile in `ls /home/aceuser/initial-config/keystore/*.key`; do
-  if [ -z "${ACE_KEYSTORE_PASSWORD}" ]; then
-    log "No keystore password defined"
-    exit 1
-  fi
-
-  filename=$(basename ${keyfile})
-  dirname=$(dirname ${keyfile})
-  alias=$(echo ${filename} | sed -e 's/\.key$'//)
-  certfile=${dirname}/${alias}.crt
-  passphrasefile=${dirname}/${alias}.pass
+if ls /home/aceuser/initial-config/keystore/*.key >/dev/null 2>&1; then
 
-  if [ ! -f ${certfile} ]; then
-    log "Certificate file ${certfile} not found."
-    exit 1
+  if [ $(cat /home/aceuser/initial-config/keystore/*.key | wc -l) -gt 0 ]; then
+    if [ -f /home/aceuser/ace-server/keystore.jks ]; then
+      OUTPUT=$(rm /home/aceuser/ace-server/keystore.jks 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    fi
   fi
 
-  if [ -f ${passphrasefile} ];then
-    ACE_PRI_KEY_PASS=$(cat ${passphrasefile})
-    OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -passin pass:${ACE_PRI_KEY_PASS} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
-  else
-    OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
-  fi
-  logAndExitIfError $? "${OUTPUT}"
-
-  OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importkeystore -srckeystore /home/aceuser/ace-server/keystore.p12 -destkeystore /home/aceuser/ace-server/keystore.jks -srcstorepass ${ACE_KEYSTORE_PASSWORD} -deststorepass ${ACE_KEYSTORE_PASSWORD} -srcalias ${alias} -destalias ${alias} -srcstoretype PKCS12 -noprompt 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-
-  OUTPUT=$(rm /home/aceuser/ace-server/keystore.p12 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-done
+  IFS=$'\n'
+  for keyfile in `ls /home/aceuser/initial-config/keystore/*.key`; do
+    if [ -s "${keyfile}" ]; then
+      if [ -z "${ACE_KEYSTORE_PASSWORD}" ]; then
+        log "No keystore password defined"
+        exit 1
+      fi
+
+      filename=$(basename ${keyfile})
+      dirname=$(dirname ${keyfile})
+      alias=$(echo ${filename} | sed -e 's/\.key$'//)
+      certfile=${dirname}/${alias}.crt
+      passphrasefile=${dirname}/${alias}.pass
+
+      if [ ! -f ${certfile} ]; then
+        log "Certificate file ${certfile} not found."
+        exit 1
+      fi
+
+      if [ -f ${passphrasefile} ];then
+        ACE_PRI_KEY_PASS=$(cat ${passphrasefile})
+        OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -passin pass:${ACE_PRI_KEY_PASS} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
+      else
+        OUTPUT=$(openssl pkcs12 -export -in ${certfile} -inkey ${keyfile} -out /home/aceuser/ace-server/keystore.p12 -name ${alias} -password pass:${ACE_KEYSTORE_PASSWORD} 2>&1)
+      fi
+      logAndExitIfError $? "${OUTPUT}"
+
+      OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importkeystore -srckeystore /home/aceuser/ace-server/keystore.p12 -destkeystore /home/aceuser/ace-server/keystore.jks -srcstorepass ${ACE_KEYSTORE_PASSWORD} -deststorepass ${ACE_KEYSTORE_PASSWORD} -srcalias ${alias} -destalias ${alias} -srcstoretype PKCS12 -noprompt 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+
+      OUTPUT=$(rm /home/aceuser/ace-server/keystore.p12 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    fi
+  done
+fi
 
 log "Keystore configuration complete"
diff --git a/ace_config_odbcini.sh b/ace_config_odbcini.sh
index 5840b1e..55d7b93 100644
--- a/ace_config_odbcini.sh
+++ b/ace_config_odbcini.sh
@@ -16,6 +16,9 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 
 log "Handling odbcini configuration"
 
-ODBCINI=/home/aceuser/ace-server/odbc.ini
+if [ -s "/home/aceuser/initial-config/odbcini/odbc.ini"]; then
+  ODBCINI=/home/aceuser/ace-server/odbc.ini
+  cp /home/aceuser/initial-config/odbcini/odbc.ini ${ODBCINI}
+fi
 
-cp /home/aceuser/initial-config/odbcini/odbc.ini ${ODBCINI}
+log "Odbcini configuration complete"
diff --git a/ace_config_policy.sh b/ace_config_policy.sh
index 93dd9ed..428e5ff 100644
--- a/ace_config_policy.sh
+++ b/ace_config_policy.sh
@@ -13,7 +13,17 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 log "Handling policy configuration"
 
 mkdir /home/aceuser/ace-server/overrides/DefaultPolicies
-cp /home/aceuser/initial-config/policy/*.policyxml /home/aceuser/ace-server/overrides/DefaultPolicies/.
-cp /home/aceuser/initial-config/policy/policy.descriptor /home/aceuser/ace-server/overrides/DefaultPolicies/policy.descriptor
+
+if ls /home/aceuser/initial-config/policy/*.policyxml >/dev/null 2>&1; then
+  for policyfile in `ls /home/aceuser/initial-config/policy/*.policyxml`; do
+    if [ -s "${policyfile}" ]; then
+      cp "${policyfile}" /home/aceuser/ace-server/overrides/DefaultPolicies/.
+    fi
+  done
+fi
+
+if [ -s "/home/aceuser/initial-config/policy/policy.descriptor" ]; then
+  cp /home/aceuser/initial-config/policy/policy.descriptor /home/aceuser/ace-server/overrides/DefaultPolicies/policy.descriptor
+fi
 
 log "Policy configuration complete"
diff --git a/ace_config_serverconf.sh b/ace_config_serverconf.sh
index 46f709b..0d18ded 100644
--- a/ace_config_serverconf.sh
+++ b/ace_config_serverconf.sh
@@ -12,6 +12,8 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 
 log "Handling server.conf configuration"
 
-cp /home/aceuser/initial-config/serverconf/server.conf.yaml /home/aceuser/ace-server/overrides/server.conf.yaml
+if [ -s "/home/aceuser/initial-config/serverconf/server.conf.yaml" ]; then
+  cp /home/aceuser/initial-config/serverconf/server.conf.yaml /home/aceuser/ace-server/overrides/server.conf.yaml
+fi
 
 log "server.conf configuration complete"
diff --git a/ace_config_setdbparms.sh b/ace_config_setdbparms.sh
index 4357c32..05742f3 100755
--- a/ace_config_setdbparms.sh
+++ b/ace_config_setdbparms.sh
@@ -16,25 +16,22 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 
 log "Handling setdbparms configuration"
 
-FILE=/home/aceuser/initial-config/setdbparms/setdbparms.txt
-
-if [ ! -f $FILE ]; then
-  log "File not found: ${FILE}"
-  exit 1
+if [ -s "/home/aceuser/initial-config/setdbparms/setdbparms.txt"]; then
+  FILE=/home/aceuser/initial-config/setdbparms/setdbparms.txt
+
+  OLDIFS=${IFS}
+  IFS=$'\n'
+  for line in $(cat $FILE | tr -d '\r'); do
+    if [[ $line =~ ^\# ]]; then
+      continue
+    fi
+    IFS=${OLDIFS}
+    fields=($line)
+    log "Setting user and password for resource ${fields[0]}"
+
+    OUTPUT=$(mqsisetdbparms -w /home/aceuser/ace-server -n ${fields[0]} -u ${fields[1]} -p ${fields[2]} 2>&1)
+    logAndExitIfError $? "${OUTPUT}"
+  done
 fi
 
-OLDIFS=${IFS}
-IFS=$'\n'
-for line in $(cat $FILE | tr -d '\r'); do
-  if [[ $line =~ ^\# ]]; then
-    continue
-  fi
-  IFS=${OLDIFS}
-  fields=($line)
-  log "Setting user and password for resource ${fields[0]}"
-
-  OUTPUT=$(mqsisetdbparms -w /home/aceuser/ace-server -n ${fields[0]} -u ${fields[1]} -p ${fields[2]} 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-done
-
 log "setdbparms configuration complete"
diff --git a/ace_config_truststore.sh b/ace_config_truststore.sh
index f5a612c..da0680d 100644
--- a/ace_config_truststore.sh
+++ b/ace_config_truststore.sh
@@ -12,22 +12,29 @@ source ${SCRIPT_DIR}/ace_config_logging.sh
 
 log "Handling truststore configuration"
 
-if [ -f /home/aceuser/ace-server/truststore.jks ]; then
-  OUTPUT=$(rm /home/aceuser/ace-server/truststore.jks 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-fi
+if ls /home/aceuser/initial-config/truststore/*.crt >/dev/null 2>&1; then
 
-IFS=$'\n'
-for file in `ls /home/aceuser/initial-config/truststore/*.crt`; do
-  if [ -z "${ACE_TRUSTSTORE_PASSWORD}" ]; then
-    log "No truststore password defined"
-    exit 1
+  if [ $(cat /home/aceuser/initial-config/truststore/*.crt | wc -l) -gt 0 ]; then
+    if [ -f /home/aceuser/ace-server/truststore.jks ]; then
+      OUTPUT=$(rm /home/aceuser/ace-server/truststore.jks 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    fi
   fi
 
-  filename=$(basename $file)
-  alias=$(echo $filename | sed -e 's/\.crt$'//)
-  OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importcert -trustcacerts -alias ${filename} -file ${file} -keystore /home/aceuser/ace-server/truststore.jks -storepass ${ACE_TRUSTSTORE_PASSWORD} -noprompt 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-done
+  IFS=$'\n'
+  for file in `ls /home/aceuser/initial-config/truststore/*.crt`; do
+    if [ -s "${file}" ]; then
+      if [ -z "${ACE_TRUSTSTORE_PASSWORD}" ]; then
+        log "No truststore password defined"
+        exit 1
+      fi
+
+      filename=$(basename $file)
+      alias=$(echo $filename | sed -e 's/\.crt$'//)
+      OUTPUT=$(/opt/ibm/ace-11/common/jdk/jre/bin/keytool -importcert -trustcacerts -alias ${filename} -file ${file} -keystore /home/aceuser/ace-server/truststore.jks -storepass ${ACE_TRUSTSTORE_PASSWORD} -noprompt 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    fi
+  done
+fi
 
 log "Truststore configuration complete"
diff --git a/ace_config_webusers.sh b/ace_config_webusers.sh
index 3de95fb..ea68b55 100644
--- a/ace_config_webusers.sh
+++ b/ace_config_webusers.sh
@@ -18,49 +18,62 @@ log "Handling webusers configuration"
 
 ADMINUSERSFILE=/home/aceuser/initial-config/webusers/admin-users.txt
 VIEWERUSERSFILE=/home/aceuser/initial-config/webusers/viewer-users.txt
+DASHBOARDUSERSFILE=/home/aceuser/initial-config/webusers/dashboard-users.txt
 
-if [ ! -f $ADMINUSERSFILE ]; then
-  log "File not found: ${ADMINUSERSFILE}"
-  exit 1
-fi
+if [ -s $ADMINUSERSFILE ] || [ -s $VIEWERUSERSFILE ] || [ -s $DASHBOARDUSERSFILE ]; then
+  OUTPUT=$(mqsichangeauthmode -w /home/aceuser/ace-server -s active -m file 2>&1)
+  logAndExitIfError $? "${OUTPUT}"
 
-if [ ! -f $VIEWERUSERSFILE ]; then
-  log "File not found: ${VIEWERUSERSFILE}"
-  exit 1
-fi
+  OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r admin -p all+ 2>&1)
+  logAndExitIfError $? "${OUTPUT}"
 
-OUTPUT=$(mqsichangeauthmode -w /home/aceuser/ace-server -s active -m file 2>&1)
-logAndExitIfError $? "${OUTPUT}"
+  OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r viewer -p read+ 2>&1)
+  logAndExitIfError $? "${OUTPUT}"
 
-OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r admin -p all+ 2>&1)
-logAndExitIfError $? "${OUTPUT}"
+  OLDIFS=${IFS}
 
-OUTPUT=$(mqsichangefileauth -w /home/aceuser/ace-server -r viewer -p read+ 2>&1)
-logAndExitIfError $? "${OUTPUT}"
+  if [ -s $ADMINUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $ADMINUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating admin user ${fields[0]}"
 
-OLDIFS=${IFS}
-IFS=$'\n'
-for line in $(cat $ADMINUSERSFILE | tr -d '\r'); do
-  if [[ $line =~ ^\# ]]; then
-    continue
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r admin 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
   fi
-  IFS=${OLDIFS}
-  fields=($line)
-  log "Creating admin user ${fields[0]}"
 
-  OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r admin 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-done
+  if [ -s $VIEWERUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $VIEWERUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating viewer user ${fields[0]}"
 
-IFS=$'\n'
-for line in $(cat $VIEWERUSERSFILE | tr -d '\r'); do
-  if [[ $line =~ ^\# ]]; then
-    continue
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
   fi
-  IFS=${OLDIFS}
-  fields=($line)
-  log "Creating viewer user ${fields[0]}"
 
-  OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
-  logAndExitIfError $? "${OUTPUT}"
-done
+  if [ -s $DASHBOARDUSERSFILE ]; then
+    IFS=$'\n'
+    for line in $(cat $DASHBOARDUSERSFILE | tr -d '\r'); do
+      if [[ $line =~ ^\# ]]; then
+        continue
+      fi
+      IFS=${OLDIFS}
+      fields=($line)
+      log "Creating viewer user ${fields[0]}"
+
+      OUTPUT=$(mqsiwebuseradmin -w /home/aceuser/ace-server -c -u ${fields[0]} -a ${fields[1]} -r viewer 2>&1)
+      logAndExitIfError $? "${OUTPUT}"
+    done
+  fi
+fi
diff --git a/ace_integration_server.sh b/ace_integration_server.sh
index 56f0cdd..517c472 100755
--- a/ace_integration_server.sh
+++ b/ace_integration_server.sh
@@ -11,7 +11,7 @@ if [ -z "$MQSI_VERSION" ]; then
   source /opt/ibm/ace-11/server/bin/mqsiprofile
 fi
 
-if [ -f /home/aceuser/ace-server/odbc.ini ]; then
+if [ -s /home/aceuser/ace-server/odbc.ini ]; then
   export ODBCINI=/home/aceuser/ace-server/odbc.ini
 fi
 
diff --git a/build-rhel.sh b/build-rhel.sh
new file mode 100755
index 0000000..5083817
--- /dev/null
+++ b/build-rhel.sh
@@ -0,0 +1,49 @@
+#!/bin/bash -ex
+echo "Building ACE build container"
+buildType=$1
+buildTag=$2
+aceInstall=$3
+mqImage=$4
+
+
+if [ -z "$aceInstall" ]
+then
+      echo "Building temporary container with default ACE install parameters"
+      docker build --build-arg  -t ace/builder:11.0.0.3 . -f ./rhel/Dockerfile.build
+else
+      echo "Building temporary container with ACE install $buildType"
+      docker build --build-arg ACE_INSTALL=$aceInstall -t ace/builder:11.0.0.3 . -f ./rhel/Dockerfile.build
+fi
+
+docker create --name builder ace/builder:11.0.0.3
+docker cp builder:/opt/ibm/ace-11 ./rhel/ace-11
+docker cp builder:/go/src/github.com/ot4i/ace-docker/runaceserver ./rhel/runaceserver
+docker cp builder:/go/src/github.com/ot4i/ace-docker/chkaceready ./rhel/chkaceready
+docker cp builder:/go/src/github.com/ot4i/ace-docker/chkacehealthy ./rhel/chkacehealthy
+docker rm -f builder
+
+echo "Building ACE runtime container"
+
+# Replace the FROM statement to use the MQ container
+sed -i "s%^FROM .*%FROM $mqImage%" ./rhel/Dockerfile.acemqrhel
+
+case $buildType in
+"ace-dev-only")
+   echo "Building ACE only for development"
+   docker build -t $buildTag -f ./rhel/Dockerfile.acerhel .
+   ;;
+"ace-only")
+   echo "Building ACE only for production"
+   docker build -t $buildTag -f ./rhel/Dockerfile.acerhel .
+   ;;
+"ace-mq")
+   echo "Building ACE with MQ for production"
+   docker build -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
+   ;;
+"ace-dev-mq-dev")
+   echo "Building ACE with MQ for production"
+   docker build -t $buildTag --build-arg BASE_IMAGE=$mqImage -f ./rhel/Dockerfile.acemqrhel .
+  ;;
+*) echo "Invalid option"
+   ;;
+esac
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 092e10c..0000000
--- a/build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-echo "Building ACE build container"
-buildType=$1
-
-if [ -z "$2" ]
-then
-      echo "Building with default ACE install parameters"
-      docker build --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
-        -t ace/builder:11.0.0.2 . -f ./rhel/Dockerfile.build
-else
-      echo "Building with ACE install $1"
-      docker build --build-arg ACE_INSTALL=$2 --build-arg https_proxy=$https_proxy --build-arg http_proxy=$http_proxy \
-        -t ace/builder:11.0.0.2 . -f ./rhel/Dockerfile.build
-fi
-
-docker create --name builder ace/builder:11.0.0.2
-docker cp builder:/opt/ibm/ace-11 ./rhel/ace-11
-docker cp builder:/go/src/github.com/ot4i/ace-docker/runaceserver ./rhel/runaceserver
-docker cp builder:/go/src/github.com/ot4i/ace-docker/chkaceready ./rhel/chkaceready
-docker cp builder:/go/src/github.com/ot4i/ace-docker/chkacehealthy ./rhel/chkacehealthy
-docker rm -f builder
-
-echo "Building ACE runtime container"
-
-case $buildType in
-"ace-dev-only")
-   echo "Building ACE only for development"
-   docker build -t ace/ace-dev-only -f ./rhel/Dockerfile.acerhel .
-   ;;
-"ace-only")
-   echo "Building ACE only for production"
-   docker build -t ace/ace-only -f ./rhel/Dockerfile.acerhel .
-   ;;
-"ace-mq")
-   echo "Building ACE with MQ for production"
-   docker build -t ace/ace-mq --build-arg BASE_IMAGE=$3 -f ./rhel/Dockerfile.acemqrhel .
-   ;;
-"ace-dev-mq-dev")
-   echo "Building ACE with MQ for production"
-   docker build -t ace/ace-dev-mq-dev --build-arg BASE_IMAGE=$3 -f ./rhel/Dockerfile.acemqrhel .
-  ;;
-*) echo "Invalid option"
-   ;;
-esac
diff --git a/rhel/Dockerfile.acerhel b/rhel/Dockerfile.acerhel
index 0f5270d..49af22e 100644
--- a/rhel/Dockerfile.acerhel
+++ b/rhel/Dockerfile.acerhel
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/rhel7:7.5
+FROM registry.access.redhat.com/rhel7
 
 WORKDIR /opt/ibm
 
diff --git a/rhel/Dockerfile.build b/rhel/Dockerfile.build
index 575fc0e..103c233 100644
--- a/rhel/Dockerfile.build
+++ b/rhel/Dockerfile.build
@@ -11,7 +11,7 @@ RUN go test -v ./cmd/runaceserver/
 RUN go test -v ./internal/...
 RUN go vet ./cmd/... ./internal/...
 
-ARG ACE_INSTALL=ace-11.0.0.2.tar.gz
+ARG ACE_INSTALL=ace-11.0.0.3.tar.gz
 RUN pwd
 WORKDIR /opt/ibm
 RUN pwd