From f459b90a5c9ff5f67cc7c60a68b979d993ec1668 Mon Sep 17 00:00:00 2001
From: ibmmqmet <marke_taylor@uk.ibm.com>
Date: Tue, 20 Aug 2019 11:02:52 +0100
Subject: [PATCH] Update Dockerfile for newer Ubuntu level

---
 Dockerfile       | 9 +++++----
 buildInDocker.sh | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 89c2592..0adeb47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE=ubuntu:18.10
+ARG BASE_IMAGE=ubuntu:19.04
 FROM $BASE_IMAGE
 
 ARG GOPATH_ARG="/go"
 
-ENV GOVERSION=1.10 \
+ENV GOVERSION=1.12 \
     GOPATH=$GOPATH_ARG \
-    ORG="github.com/ibm-messaging" \
-    REPO="mq-golang"
+    ORG="github.com/ibm-messaging"
+
 
 # Install the Go compiler and Git
 RUN export DEBIAN_FRONTEND=noninteractive \
@@ -67,6 +67,7 @@ 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 . $GOPATH/src/$ORG/$REPO
 RUN chmod -R a+rx $GOPATH/src
 
diff --git a/buildInDocker.sh b/buildInDocker.sh
index 270dba8..072fb2d 100644
--- a/buildInDocker.sh
+++ b/buildInDocker.sh
@@ -27,6 +27,9 @@ echo "Running as " `id`
 # Build the libraries so they can be used by other programs
 cd $GOPATH/src
 
+echo "Using compiler:"
+go version
+
 for pkg in $ORG/$REPO/ibmmq $ORG/$REPO/mqmetric
 do
   lib=`basename $pkg`
@@ -47,3 +50,4 @@ done
 
 echo "Building program: mqitest"
 go build -o bin/mqitest $srcdir/mqitest/mqitest.go
+