RHEL build uses redist client and RHEL minimal

mq-advanced-server-rhel/go-build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,11 @@
 
 # Builds and tests the golang programs used by the MQ image.
 
-set -e
+set -ex
 
-cd $GOPATH/src/github.com/ibm-messaging/mq-container/
+# Handle a GOPATH with multiple entries (just choose the first one)
+IFS=':' read -ra DIR <<< "$GOPATH"
+cd ${DIR[0]}/src/github.com/ibm-messaging/mq-container/
 
 # Build and test the Go code
 mkdir -p build

mq-advanced-server-rhel/go-buildah.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,11 @@ IMAGE_REVISION=${IMAGE_REVISION:="Not Applicable"}
 IMAGE_SOURCE=${IMAGE_SOURCE:="Not Applicable"}
 
 podman run \
-  --volume ${PWD}:/go/src/github.com/ibm-messaging/mq-container/ \
-  --env GOPATH=/go \
+  --volume ${PWD}:/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/ \
   --env IMAGE_REVISION="$IMAGE_REVISION" \
   --env IMAGE_SOURCE="$IMAGE_SOURCE" \
   --env MQDEV=${dev} \
+  --user $(id -u) \
   --rm \
   ${tag} \
-  bash -c "cd /go/src/github.com/ibm-messaging/mq-container/ && ./mq-advanced-server-rhel/go-build.sh"
+  bash -c "cd /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/ && ./mq-advanced-server-rhel/go-build.sh"

mq-advanced-server-rhel/mq-buildah.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,13 +17,13 @@
 
 # Build a RHEL image, using the buildah tool
 # Usage
-# mq-buildah.sh ARCHIVEFILE PACKAGES
+# mq-buildah.sh ARCHIVE-NAME PACKAGES
 
 set -x
 set -e
 
 function usage {
-  echo "Usage: $0 ARCHIVENAME PACKAGES TAG VERSION MQDevFlag"
+  echo "Usage: $0 ARCHIVE-NAME PACKAGES TAG VERSION MQDevFlag"
   exit 20
 }
 
@@ -36,7 +36,8 @@ fi
 # Setup MQ server working container
 ###############################################################################
 
-readonly ctr_mq=$(buildah from rhel7)
+# Use RHEL 7 minimal container (which doesn't include things like Python or Yum)
+readonly ctr_mq=$(buildah from rhel7-minimal)
 if [ -z "$ctr_mq" ]
 then
   echo "ERROR: ctr_mq is empty. Check above output for errors"
@@ -60,13 +61,10 @@ readonly mqdev=$5
 # Install MQ server
 ###############################################################################
 
-groupadd --root ${mnt_mq} --system --gid 888 mqm
-useradd --root ${mnt_mq} --system --uid 888 --gid mqm mqm
-usermod --root ${mnt_mq} -aG root mqm
-usermod --root ${mnt_mq} -aG mqm root
-
+# Use the Yum repositories configured on the host
+cp /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/
 # Install the packages required by MQ
-buildah run $ctr_mq -- yum install -y --setopt install_weak_deps=false --setopt=tsflags=nodocs --setopt=override_install_langs=en_US.utf8 \
+yum install -y --installroot=${mnt_mq} --setopt install_weak_deps=false --setopt=tsflags=nodocs --setopt=override_install_langs=en_US.utf8 \
   bash \
   bc \
   coreutils \
@@ -78,12 +76,20 @@ buildah run $ctr_mq -- yum install -y --setopt install_weak_deps=false --setopt=
   passwd \
   procps-ng \
   sed \
+  shadow-utils \
   tar \
-  util-linux
+  util-linux \
+  which
+
+groupadd --root ${mnt_mq} --system --gid 888 mqm
+useradd --root ${mnt_mq} --system --uid 888 --gid mqm mqm
+usermod --root ${mnt_mq} -aG root mqm
+usermod --root ${mnt_mq} -aG mqm root
 
 # Clean up cached files
-buildah run $ctr_mq -- yum clean all
+yum clean --installroot=${mnt_mq} all
 rm -rf ${mnt_mq}/var/cache/yum/*
+rm -rf ${mnt_mq}/etc/yum.repos.d/*
 
 # Install MQ server packages into the MQ builder image
 ./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${archive}" "${packages}"

mq-advanced-server-rhel/mq-golang-sdk-buildah.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # -*- mode: sh -*-
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 set -ex
 
 function usage {
-  echo "Usage: $0 ARCHIVENAME TAG"
+  echo "Usage: $0 REDIST-ARCHIVE-NAME TAG"
   exit 20
 }
 
@@ -29,41 +29,30 @@ if [ "$#" -ne 2 ]; then
   usage
 fi
 
-readonly mq_archive=downloads/$1
+readonly mq_redist_archive=downloads/$1
 readonly tag=$2
-# Use plain RHEL 7 container
-# Note: Red Hat's devtools/go-toolset-7-rhel7 image doesn't allow use of 'root'
-# user required for installing the MQ SDK
-readonly ctr_mq=$(buildah from rhel7)
+# Use Red Hat's Go toolset image as the base
+readonly ctr_mq=$(buildah from devtools/go-toolset-7-rhel7)
 if [ -z "$ctr_mq" ]
 then
   echo "ERROR: ctr_mq is empty. Check above output for errors"
   exit 50
 fi
 
-readonly mnt_mq=$(buildah mount $ctr_mq)
-if [ -z "$mnt_mq" ]
+readonly mnt_mq_go=$(buildah mount $ctr_mq)
+if [ -z "$mnt_mq_go" ]
 then
-  echo "ERROR: mnt_mq is empty. Check above output for errors"
+  echo "ERROR: mnt_mq_go is empty. Check above output for errors"
   exit 50
 fi
 
-# Add mqm user
-sudo groupadd --root $mnt_mq --system --gid 888 mqm
-sudo useradd --root $mnt_mq --system --uid 888 --gid mqm mqm
-sudo usermod --root $mnt_mq -aG root mqm
-sudo usermod --root $mnt_mq -aG mqm root
+# Install the MQ redistributable client (including header files) into the Go builder image
+mkdir -p ${mnt_mq_go}/opt/mqm
+tar -xzf ${mq_redist_archive} -C ${mnt_mq_go}/opt/mqm
 
-# Enable Yum repository for "optional" RPMs, which is needed for "golang"
-buildah run ${ctr_mq} -- yum-config-manager --enable rhel-7-server-optional-rpms
-# Install Go compiler
-buildah run ${ctr_mq} -- yum install -y golang git gcc
-
-# Install the MQ SDK into the Go builder image
-./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${mq_archive}" "MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm"
 # Clean up Yum files
-buildah run ${ctr_mq} -- yum clean all --releasever 7
-rm -rf ${mnt_mq}/var/cache/yum/*
+rm -rf ${mnt_mq_go}/etc/yum.repos.d/*
+
 buildah unmount ${ctr_mq}
 # Set environment variables for MQ/Go compilation
 buildah config \