From 11890d887bcdf7822cd775a6fb84bcaa86d9076d Mon Sep 17 00:00:00 2001
From: Luke Powlett <luke.powlett@ibm.com>
Date: Mon, 23 Sep 2019 16:54:51 +0100
Subject: [PATCH] Added args for go toolset image and tag, fixed issue with
 logger

---
 Dockerfile-server       | 6 ++++--
 cmd/runmqserver/qmgr.go | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile-server b/Dockerfile-server
index 513fc80..c2c30ce 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -14,10 +14,12 @@
 
 ARG BASE_IMAGE=registry.access.redhat.com/ubi7/ubi-minimal
 ARG BASE_TAG=7.7-98
+ARG GO_TOOLSET_IMAGE=registry.access.redhat.com/devtools/go-toolset-rhel7
+ARG GO_TOOLSET_TAG=1.11.13
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM registry.access.redhat.com/devtools/go-toolset-7-rhel7 as builder
+FROM $GO_TOOLSET_IMAGE:$GO_TOOLSET_TAG as builder
 # FROM docker.io/centos/go-toolset-7-centos7 as builder
 # The URL to download the MQ installer from in tar.gz format
 # This assumes an archive containing the MQ RPM install packages
@@ -36,7 +38,7 @@ COPY cmd/ ./cmd
 COPY internal/ ./internal
 COPY pkg/ ./pkg
 COPY vendor/ ./vendor
-ENV PATH="${PATH}:/opt/rh/go-toolset-7/root/usr/bin" \
+ENV PATH="${PATH}:/opt/rh/go-toolset-1.11/root/usr/bin" \
     CGO_CFLAGS="-I/opt/mqm/inc/" \
     CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
 RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/
diff --git a/cmd/runmqserver/qmgr.go b/cmd/runmqserver/qmgr.go
index b68c7b8..7f0c1e1 100644
--- a/cmd/runmqserver/qmgr.go
+++ b/cmd/runmqserver/qmgr.go
@@ -175,7 +175,7 @@ func stopQueueManager(name string) error {
 	log.Println("Stopping queue manager")
 	isStandby, err := ready.IsRunningAsStandbyQM(name)
 	if err != nil {
-		log.Printf("Error getting status for queue manager %v: ", name, err.Error())
+		log.Printf("Error getting status for queue manager %v: %v", name, err.Error())
 		return err
 	}
 	args := []string{"-w", "-r", name}