diff --git a/Dockerfile-server b/Dockerfile-server index 80d656b3..ff0cbd2f 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -17,7 +17,7 @@ ARG BASE_TAG=7.7-98 ############################################################################### # Build stage to build Go code ############################################################################### -FROM registry.access.redhat.com/devtools/go-toolset-7-rhel7 as builder +FROM registry.access.redhat.com/devtools/go-toolset-rhel7:1.11.13 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 @@ -35,7 +35,7 @@ WORKDIR /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/ COPY cmd/ ./cmd COPY internal/ ./internal 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 b68c7b8c..7f0c1e15 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} diff --git a/manifests/dockerhub/manifest-9.1.3.yaml b/manifests/dockerhub/manifest-9.1.3.yaml index 18124e5c..a3b013fd 100644 --- a/manifests/dockerhub/manifest-9.1.3.yaml +++ b/manifests/dockerhub/manifest-9.1.3.yaml @@ -12,17 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -image: ibmcom/mq:9.1.3.0-r2 +image: ibmcom/mq:9.1.3.0-r3 manifests: - - image: ibmcom/mq:9.1.3.0-r2-amd64 + - image: ibmcom/mq:9.1.3.0-r3-amd64 platform: architecture: amd64 os: linux - - image: ibmcom/mq:9.1.3.0-r2-ppc64le + - image: ibmcom/mq:9.1.3.0-r3-ppc64le platform: architecture: ppc64le os: linux - - image: ibmcom/mq:9.1.3.0-r2-s390x + - image: ibmcom/mq:9.1.3.0-r3-s390x platform: architecture: s390x os: linux diff --git a/manifests/dockerhub/manifest-latest.yaml b/manifests/dockerhub/manifest-latest.yaml index 0c8afa50..6a039a8e 100644 --- a/manifests/dockerhub/manifest-latest.yaml +++ b/manifests/dockerhub/manifest-latest.yaml @@ -14,15 +14,15 @@ image: ibmcom/mq:latest manifests: - - image: ibmcom/mq:9.1.3.0-r2-amd64 + - image: ibmcom/mq:9.1.3.0-r3-amd64 platform: architecture: amd64 os: linux - - image: ibmcom/mq:9.1.3.0-r2-ppc64le + - image: ibmcom/mq:9.1.3.0-r3-ppc64le platform: architecture: ppc64le os: linux - - image: ibmcom/mq:9.1.3.0-r2-s390x + - image: ibmcom/mq:9.1.3.0-r3-s390x platform: architecture: s390x os: linux diff --git a/manifests/dockerstore/manifest-9.1.3.yaml b/manifests/dockerstore/manifest-9.1.3.yaml index cd7025c7..e59bec0e 100644 --- a/manifests/dockerstore/manifest-9.1.3.yaml +++ b/manifests/dockerstore/manifest-9.1.3.yaml @@ -12,17 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2 +image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r3 manifests: - - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-amd64 + - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r3-amd64 platform: architecture: amd64 os: linux - - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-ppc64le + - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r3-ppc64le platform: architecture: ppc64le os: linux - - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r2-s390x + - image: ibmcorp/mqadvanced-server-dev:9.1.3.0-r3-s390x platform: architecture: s390x os: linux