Merge branch 'private-master' into UserExternal

2020-11-03 10:06:23 +05:30
parent f39f90728f 94ad66661e
commit 8d164340c6
14 changed files with 250 additions and 39 deletions
--- a/cmd/runmqserver/version.go
+++ b/cmd/runmqserver/version.go
@@ -20,6 +20,7 @@ import (
 	"strings"

 	"github.com/ibm-messaging/mq-container/internal/command"
+	"github.com/ibm-messaging/mq-container/internal/mqversion"
 )

 var (
@@ -50,7 +51,7 @@ func logImageTag() {
 }

 func logMQVersion() {
-	mqVersion, _, err := command.Run("dspmqver", "-b", "-f", "2")
+	mqVersion, err := mqversion.Get()
 	if err != nil {
 		log.Printf("Error Getting MQ version: %v", strings.TrimSuffix(string(mqVersion), "\n"))
 	}