From 4e26150542bd80ce8e9a29127b1275633fa50044 Mon Sep 17 00:00:00 2001
From: Tom Jefferson <thomas.jefferson1@ibm.com>
Date: Thu, 12 May 2022 16:59:45 +0100
Subject: [PATCH] Update UBI/Go and add buffer to signals

---
 .travis.yml                | 2 +-
 Dockerfile-server          | 4 ++--
 cmd/runmqserver/signals.go | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9cc27b5..faedb43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ sudo: required
 language: go
 
 go:
-  - "1.16.12"
+  - "1.17.7"
 
 services:
   - docker
diff --git a/Dockerfile-server b/Dockerfile-server
index 621f775..5975a97 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal
-ARG BASE_TAG=8.5-243.1651231653
+ARG BASE_TAG=8.6-751
 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset
-ARG BUILDER_TAG=1.16.12-10
+ARG BUILDER_TAG=1.17.7-13
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.3.0.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################
diff --git a/cmd/runmqserver/signals.go b/cmd/runmqserver/signals.go
index 003565d..5540d88 100644
--- a/cmd/runmqserver/signals.go
+++ b/cmd/runmqserver/signals.go
@@ -1,5 +1,5 @@
 /*
-© Copyright IBM Corporation 2017, 2018
+© Copyright IBM Corporation 2017, 2022
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,8 +33,8 @@ func signalHandler(qmgr string) chan int {
 	control := make(chan int)
 	// Use separate channels for the signals, to avoid SIGCHLD signals swamping
 	// the buffer, and preventing other signals.
-	stopSignals := make(chan os.Signal)
-	reapSignals := make(chan os.Signal)
+	stopSignals := make(chan os.Signal, 1)
+	reapSignals := make(chan os.Signal, 1)
 	signal.Notify(stopSignals, syscall.SIGTERM, syscall.SIGINT)
 	go func() {
 		for {