From b94c26fda3c75c75e338cba8e0d5eb188dc0f0d1 Mon Sep 17 00:00:00 2001 From: Alex Mirski-Fitton Date: Thu, 7 Jul 2022 11:06:53 +0100 Subject: [PATCH 1/2] Update to 9.2.0.6 --- .travis.yml | 8 ++++---- CHANGELOG.md | 4 ++++ Dockerfile-server | 2 +- config.env | 2 +- docs/security.md | 4 ++-- docs/testing.md | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7bedc8c..8edc46c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,10 @@ services: env: global: - MAIN_BRANCH=v9.2.0.x-eus - - MQ_LTS_VERSION=9.2.0.5 + - MQ_LTS_VERSION=9.2.0.6 - TAGCACHE_FILE=tagcache - RELEASE=r2 - - RELEASE_LTS=r3 + - RELEASE_LTS=r1 go_import_path: "github.com/ibm-messaging/mq-container" @@ -66,7 +66,7 @@ jobs: - LTS=true - TAGCACHE_FILE=tagcache-lts - MQ_VERSION=$MQ_LTS_VERSION - - MQ_ARCHIVE_REPOSITORY=$MQ_9205_EUS_ARCHIVE_REPOSITORY_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_9206_EUS_ARCHIVE_REPOSITORY_AMD64 - RELEASE=$RELEASE_LTS script: bash -e travis-build-scripts/run.sh - stage: build @@ -78,7 +78,7 @@ jobs: - TAGCACHE_FILE=tagcache-lts - MQ_VERSION=$MQ_LTS_VERSION - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_9205_EUS_ARCHIVE_REPOSITORY_S390X + - MQ_ARCHIVE_REPOSITORY=$MQ_9206_EUS_ARCHIVE_REPOSITORY_S390X - RELEASE=$RELEASE_LTS script: bash -e travis-build-scripts/run.sh - stage: push-manifest diff --git a/CHANGELOG.md b/CHANGELOG.md index f68e0e8..5da6cc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 9.2.0.6-LTS (2022-07-20) + +* Updated to MQ version 9.2.0.6 + ## 9.2.0.5-LTS (2022-01-25) * Updated to MQ version 9.2.0.5 diff --git a/Dockerfile-server b/Dockerfile-server index 4891a57..c7ac393 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -17,7 +17,7 @@ ARG BASE_TAG=8.6-751.1655117800 ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset ARG BUILDER_TAG=1.16.12-10 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.2.0.5-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" +ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.0.6-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ############################################################################### # Build stage to build Go code ############################################################################### diff --git a/config.env b/config.env index be050de..bc8068b 100644 --- a/config.env +++ b/config.env @@ -3,6 +3,6 @@ # MQ_VERSION is the fully qualified MQ version number to build MQ_VERSION ?= 9.2.0.0 -MQ_LTS_VERSION ?= 9.2.0.5 +MQ_LTS_VERSION ?= 9.2.0.6 ########################################################################################################################################################### diff --git a/docs/security.md b/docs/security.md index afc6844..8a35777 100644 --- a/docs/security.md +++ b/docs/security.md @@ -16,7 +16,7 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - ibm-mqadvanced-server:9.2.0.5-amd64 + ibm-mqadvanced-server:9.2.0.6-amd64 ``` The MQ Advanced for Developers image does require the "chown", "setuid", "setgid" and "audit_write" capabilities (plus "dac_override" if you're using an image based on Red Hat Enterprise Linux). This is because it uses the "sudo" command to change passwords inside the container. For example, in Docker, you could do the following: @@ -31,5 +31,5 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - ibm-mqadvanced-server-dev:9.2.0.5-amd64 + ibm-mqadvanced-server-dev:9.2.0.6-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index 2d897a9..3181c21 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -25,7 +25,7 @@ make advancedserver You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example: ``` -MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.5-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.6-amd64 make test-advancedserver ``` You can pass parameters to `go test` with an environment variable. For example, to run the "TestGoldenPath" test, run the following command: From f2a9d7559550d1ba4286b9223fd8c7e1c2e1a86e Mon Sep 17 00:00:00 2001 From: Alex Mirski-Fitton Date: Thu, 7 Jul 2022 13:44:56 +0100 Subject: [PATCH 2/2] Update to Go 1.17 Also pick up latest UBI base image --- .travis.yml | 2 +- CHANGELOG.md | 1 + Dockerfile-server | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8edc46c..fb2f055 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required language: go go: - - "1.16.12" + - "1.17.10" services: - docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 5da6cc5..758f38a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 9.2.0.6-LTS (2022-07-20) * Updated to MQ version 9.2.0.6 +* Updated to Go version 1.17 ## 9.2.0.5-LTS (2022-01-25) diff --git a/Dockerfile-server b/Dockerfile-server index c7ac393..4c764ac 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2015, 2020 +# © Copyright IBM Corporation 2015, 2022 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,9 +13,9 @@ # limitations under the License. ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal -ARG BASE_TAG=8.6-751.1655117800 +ARG BASE_TAG=8.6-854 ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset -ARG BUILDER_TAG=1.16.12-10 +ARG BUILDER_TAG=1.17.10-4 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.2.0.6-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" ############################################################################### @@ -56,7 +56,8 @@ RUN go test -v ./cmd/chkmqready/ RUN go test -v ./cmd/chkmqhealthy/ RUN go test -v ./pkg/... RUN go test -v ./internal/... -RUN go vet ./cmd/... ./internal/... +# go 1.17 sigchanyzer check disabled for EUS stream as fix would introduce change of behaviour +RUN go vet -sigchanyzer=FALSE ./cmd/... ./internal/... ############################################################################### # Main build stage, to build MQ image