Update Dockerfile examples to default to current UBI

Author: ibmmqmet

Dockerfile

@@ -12,53 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE=ubuntu:20.04
-FROM $BASE_IMAGE
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/go-toolset:1.21
+FROM $BASE_IMAGE AS builder
 
 ARG GOPATH_ARG="/go"
-ARG GOVERSION=1.18      
 ARG GOARCH=amd64
 ARG MQARCH=X64
 
-ENV GOVERSION=${GOVERSION}   \
-    GOPATH=$GOPATH_ARG \
-    GOTAR=go${GOVERSION}.linux-${GOARCH}.tar.gz \
+ENV GOPATH=$GOPATH_ARG \
     ORG="github.com/ibm-messaging"
 
-
-# Install the Go compiler and Git
-RUN export DEBIAN_FRONTEND=noninteractive \
-  && bash -c 'source /etc/os-release; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-backports main restricted universe" >> /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} universe" >> /etc/apt/sources.list; \
-     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates universe" >> /etc/apt/sources.list;' \
-  && apt-get update \
-  && apt-get install -y --no-install-recommends \
-    git \
-    wget \
-    ca-certificates \
-    curl \
-    tar \
-    bash \
-    build-essential \
-  && rm -rf /var/lib/apt/lists/*
+# Make sure we've got permissions inside the container
+USER 0
 
 # Create location for the git clone and MQ installation
 RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
   && chmod -R 777 $GOPATH \
   && mkdir -p $GOPATH/src/$ORG \
   && cd /tmp       \
-  && wget -nv https://dl.google.com/go/${GOTAR} \
-  && tar -xf ${GOTAR} \
-  && mv go /usr/lib/go-${GOVERSION} \
-  && rm -f ${GOTAR} \
   && mkdir -p /opt/mqm \
   && chmod a+rx /opt/mqm
 
-# Location of the downloadable MQ client package \
-ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
+# Location of the downloadable MQ client package
+ARG RDURL_ARG="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist"
+ENV RDURL=${RDURL_ARG} \
     RDTAR="IBM-MQC-Redist-Linux${MQARCH}.tar.gz" \
     VRMF=9.4.1.0
 
@@ -77,13 +54,12 @@ RUN cd /opt/mqm \
 
 # Insert the script that will do the build
 COPY --chmod=777 buildInDocker.sh $GOPATH
-# RUN chmod 777 $GOPATH/buildInDocker.sh
 
 # Copy the rest of the source tree from this directory into the container
 # And make sure it's readable by the id that will run the compiles (not just root)
 ENV  REPO="mq-golang"
 COPY --chmod=0777 . $GOPATH/src/$ORG/$REPO
-# RUN chmod -R a+rx $GOPATH/src
 
 # Set the entrypoint to the script that will do the compilation
-ENTRYPOINT $GOPATH/buildInDocker.sh
+WORKDIR $GOPATH
+ENTRYPOINT [ "./buildInDocker.sh" ]

samples/README.md

@@ -46,8 +46,8 @@ Building a container:
 * runSample.*.Dockerfile : Instructions to create containers with runtime dependencies
 * runSample.gomod        : Copied into the container as `go.mod`
 Two variants of the Dockerfile are provided. Set the `FROM` environment variable to "UBI"
-to use Red Hat Universal Base Images as the starting points for building and runtime;
-otherwise an Ubuntu/Debian combination is used.
+to use Red Hat Universal Base Images as the starting points for building and runtime; set it to
+"DEP" to use a Ubuntu/Debian combination.
 
 The `mqitest` sample program in its own subdirectory is a more general demonstration
 of many of the features available from the MQI rather than focussed on a specific

samples/runSample.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 # This is an example of running one of the sample programs in a container.
 
 function latestSemVer {
@@ -31,13 +33,13 @@ echo Building container with tag $TAG:$VER
 
 # Build the container which includes compilation of the program. Can set the FROM
 # environment variable outside this script to choose which base image to work from.
-# The UBI variant is built on the Red Hat Universal Base Image set of containers; the
-# default is built on Ubuntu/Debian containers.
-if [ "$FROM" = "UBI" ]
+# The UBI default variant is built on the Red Hat Universal Base Image set of containers;
+# the alternative is built on Ubuntu/Debian containers.
+if [ "$FROM" = "DEB" ]
 then
-  dfile="runSample.ubi.Dockerfile"
-else
   dfile="runSample.deb.Dockerfile"
+else
+  dfile="runSample.ubi.Dockerfile"
 fi
 
 # Setting NOCACHE environment variable will force a complete rebuild of the container
@@ -64,7 +66,7 @@ then
   then
     # Run the container. Can override default command line values in amqsput via
     # env vars here.
-    docker run -e MQSERVER="SYSTEM.DEF.SVRCONN/TCP/$addr($port)" \
+    docker run --rm -e MQSERVER="SYSTEM.DEF.SVRCONN/TCP/$addr($port)" \
        -e QUEUE=DEV.QUEUE.1 \
        -e QMGR=QM1 \
        $TAG:$VER

samples/runSample.ubi.Dockerfile

@@ -23,8 +23,8 @@
 #
 # The base images are taken from the Red Hat Universal Base Images repository
 
-# Start by setting some global variables that can still be overridden on the build command line.
-ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi
+# Start by setting some global variables that could still be overridden on the build command line.
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/go-toolset:1.21
 ARG GOPATH_ARG="/go"
 
 ###########################################################
@@ -35,15 +35,15 @@ FROM $BASE_IMAGE AS builder
 ARG GOPATH_ARG
 ENV GOPATH=$GOPATH_ARG \
     ORG="github.com/ibm-messaging"
-ARG GOVERSION=1.18
 ARG GOARCH=amd64
 ARG MQARCH=X64
 
 
-# Install the Go compiler and some other tools. The version of Go that
-# is available from the repository is new enough that we don't need to
-# explicitly pull it from Google. Installing Go also gives prereqs like the C compiler.
-RUN yum --disableplugin=subscription-manager -y install wget curl tar golang \
+# Make sure we install some other tools. The version of Go that
+# is available from this base image is new enough that we don't need to
+# explicitly pull a newer version from Google.
+USER 0
+RUN yum --disableplugin=subscription-manager -y install gzip curl tar  \
   && yum --disableplugin=subscription-manager clean all
 
 # Create a location for the go programs and the MQ installation