Improve permissions on build-in-docker scripts

Author: ibmmqmet

Dockerfile

@@ -62,11 +62,13 @@ RUN cd /opt/mqm \
  && rm -f ./*.tar.gz
 
 # Insert the script that will do the build
-COPY buildMonitors.sh $GOPATH
-RUN chmod 777 $GOPATH/buildMonitors.sh
+COPY buildInDocker.sh $GOPATH
+RUN chmod 777 $GOPATH/buildInDocker.sh
 
-# Copy the rest of the source tree from this directory into the container
+# Copy the rest of the source tree from this directory into the container and
+# make sure it's readable by the user running the container
 COPY . $GOPATH/src/$ORG/$REPO
+RUN chmod -R a+rx $GOPATH/src/$ORG/$REPO
 
 # Set the entrypoint to the script that will do the compilation
-ENTRYPOINT $GOPATH/buildMonitors.sh
+ENTRYPOINT $GOPATH/buildInDocker.sh

README.md

@@ -53,7 +53,7 @@ monitor agent directory also has sample scripts, configuration files etc to help
 with getting the agent running in your specific environment.
 
 ## Using a Docker container to build the programs
-You can use the `buildMain.sh` script in this directory to build a Docker container that
+You can use the `buildMonitors.sh` script in this directory to build a Docker container that
 in turn will build the binary programs and copy them to a local directory.
 
 ## More information

buildInDocker.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# © Copyright IBM Corporation 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Script to build the monitor agent programs from within a Docker container
+
+export PATH="${PATH}:/usr/lib/go-${GOVERSION}/bin:/go/bin"
+export CGO_CFLAGS="-I/opt/mqm/inc/"
+export CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
+export GOCACHE=/tmp/.cache
+
+# Which monitor programs are to be built. By default, build the complete set available.
+# It can be overridden by setting the value on the "docker run" command with
+# a "-e MONITORS=..." flag.
+if [ -z "$MONITORS" ]
+then
+  cd $GOPATH/src/$ORG/$REPO
+  MONITORS=`ls cmd`
+fi
+
+# And do the builds into the bin directory
+cd $GOPATH
+for m in $MONITORS
+do
+  srcdir=src/$ORG/$REPO/cmd/$m
+
+  echo "Building $m"
+  if [ ! -z "$BUILD_EXTRA_INJECT" ]
+  then
+    BUILD_EXTRA_LDFLAGS="-ldflags"
+  fi
+
+  go build -o bin/$m $BUILD_EXTRA_LDFLAGS "$BUILD_EXTRA_INJECT"  $srcdir/*.go
+
+  # Copy the supporting scripts into the output directory
+  if [ -r $srcdir/$m.sh ]
+  then
+    cp $srcdir/*.sh bin
+    chmod a+rx bin/*.sh
+  fi
+  if [ -r $srcdir/$m.mqsc ]
+  then
+    cp $srcdir/*.mqsc bin
+  fi
+done

buildMain.sh

@@ -1,5 +1,3 @@
-#!/bin/bash
-
 # © Copyright IBM Corporation 2019
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,43 +12,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script to build the monitor agent programs from within a Docker container
-
-export PATH="${PATH}:/usr/lib/go-${GOVERSION}/bin:/go/bin"
-export CGO_CFLAGS="-I/opt/mqm/inc/"
-export CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
+# This simple script builds a Docker container whose purpose is simply
+# to compile the binary components of the monitoring programs, and then to copy those
+# programs to a local temporary directory.
+GOPATH="/go"
 
-# Which monitor programs are to be built. By default, build the complete set available.
-# It can be overridden by setting the value on the "docker run" command with
-# a "-e MONITORS=..." flag.
-if [ -z "$MONITORS" ]
+TAG="mq-metric-samples-gobuild"
+# Assume repo tags have been created in a sensible order
+VER=`git tag -l | sort | tail -1 | sed "s/^v//g"`
+if [ -z "$VER" ]
 then
-  cd $GOPATH/src/$ORG/$REPO
-  MONITORS=`ls cmd`
+  VER="latest"
 fi
+echo "Building container $TAG:$VER"
+
+# Build a container that has all the pieces needed to compile the Go programs for MQ
+docker build --build-arg GOPATH_ARG=$GOPATH -t $TAG:$VER .
+rc=$?
 
-# And do the builds into the bin directory
-cd $GOPATH
-for m in $MONITORS
-do
-  srcdir=src/$ORG/$REPO/cmd/$m
-
-  echo "Building $m"
-  if [ ! -z "$BUILD_EXTRA_INJECT" ]
-  then
-    BUILD_EXTRA_LDFLAGS="-ldflags"
-  fi
-
-  go build -o bin/$m $BUILD_EXTRA_LDFLAGS "$BUILD_EXTRA_INJECT"  $srcdir/*.go
-
-  # Copy the supporting scripts into the output directory
-  if [ -r $srcdir/$m.sh ]
-  then
-    cp $srcdir/*.sh bin
-    chmod a+rx bin/*.sh
-  fi
-  if [ -r $srcdir/$m.mqsc ]
-  then
-    cp $srcdir/*.mqsc bin
-  fi
-done
+# Set the userid we will run the container as
+uid=`id -u`
+gid=`id -g`
+
+if [ $rc -eq 0 ]
+then
+  # Run the image to do the compilation and extract the files
+  # from it into a local directory mounted into the container.
+  OUTDIR=$HOME/tmp/mq-metric-samples/bin
+  rm -rf $OUTDIR
+  mkdir -p $OUTDIR
+
+  # Get some variables to pass the build information into the compile steps
+  buildStamp=`date +%Y%m%d-%H%M%S`
+  gitCommit=`git rev-list -1 HEAD --abbrev-commit`
+
+  # Set this for any special status
+  extraInfo=""
+
+  # Add "-e MONITORS=..." to only compile a subset of the monitor programs
+  # Mount an output directory
+  # Delete the container once it's done its job
+  docker run --rm \
+          --user $uid:$gid \
+          -v $OUTDIR:$GOPATH/bin \
+          -e BUILD_EXTRA_INJECT="-X \"main.BuildStamp=$buildStamp $extraInfo\" -X \"main.GitCommit=$gitCommit\"" \
+          $TAG:$VER
+  echo "Compiled programs should now be in $OUTDIR"
+fi