From db7305520334f0f6f71912da635b6ae8a29b54b1 Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Mon, 13 Feb 2023 17:25:20 +0000 Subject: [PATCH 1/9] [ci skip]: Setting up v9.3.2 branch --- .travis.yml | 14 +++++++------- source-branch.env | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 007e4b68..0de4b20c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ services: env: global: - - MAIN_BRANCH=private-master + - MAIN_BRANCH=v9.3.2 - TAGCACHE_FILE=tagcache - RELEASE=r1 @@ -38,7 +38,7 @@ go_import_path: "github.com/ibm-messaging/mq-container" jobs: include: - stage: basic-build - if: branch != private-master AND tag IS blank + if: branch != v9.3.2 AND tag IS blank name: "Basic AMD64 build" os: linux env: @@ -48,12 +48,12 @@ jobs: # CD Build - stage: global-tag - if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.3.2 AND type != pull_request OR tag =~ ^release-candidate* name: "Generate Global Tag" os: linux script: bash -e travis-build-scripts/global-tag.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.3.2 OR tag =~ ^release-candidate* name: "Multi-Arch AMD64 build" os: linux env: @@ -62,7 +62,7 @@ jobs: - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_932_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.3.2 OR tag =~ ^release-candidate* name: "Multi-Arch S390X build" os: linux-s390 env: @@ -72,7 +72,7 @@ jobs: - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_932_ARCHIVE_REPOSITORY_DEV_S390X script: bash -e travis-build-scripts/run.sh - stage: build - if: branch = private-master OR tag =~ ^release-candidate* + if: branch = v9.3.2 OR tag =~ ^release-candidate* name: "Multi-Arch PPC64LE build" os: linux-ppc64le env: @@ -82,7 +82,7 @@ jobs: - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_932_ARCHIVE_REPOSITORY_DEV_PPC64LE script: bash -e travis-build-scripts/run.sh - stage: push-manifest - if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate* + if: branch = v9.3.2 AND type != pull_request OR tag =~ ^release-candidate* name: "Push Manifest-list to registry" env: - PUSH_MANIFEST_ONLY=true diff --git a/source-branch.env b/source-branch.env index b382c047..1acd9d5d 100644 --- a/source-branch.env +++ b/source-branch.env @@ -2,6 +2,6 @@ # SOURCE_BRANCH is the repository branch name for this release stream. # It should be updated when a new release fork is created but not for testing of personal builds or pre-fork updates. -SOURCE_BRANCH ?= private-master +SOURCE_BRANCH ?= v9.3.2 ########################################################################################################################################################### From 78483d58faaf27f728a6bf9e3156ef302dc3866d Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Mon, 6 Mar 2023 14:14:34 +0000 Subject: [PATCH 2/9] Update version to 9.3.2.0-r2 --- .travis.yml | 2 +- Dockerfile-server | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0de4b20c..a205dbb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: global: - MAIN_BRANCH=v9.3.2 - TAGCACHE_FILE=tagcache - - RELEASE=r1 + - RELEASE=r2 go_import_path: "github.com/ibm-messaging/mq-container" diff --git a/Dockerfile-server b/Dockerfile-server index e61d2114..d7dfc19a 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.7-1049.1675784874 +ARG BASE_TAG=8.7-1085 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.18.9-8.1675807488 +ARG BUILDER_TAG=1.18.9-13 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG MQ_ARCHIVE="downloads/9.3.2.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" From b134bd301b0291e5d2d7008d64627b17feceae5d Mon Sep 17 00:00:00 2001 From: Alec-Painter Date: Tue, 11 Apr 2023 08:25:51 +0100 Subject: [PATCH 3/9] Updated to 9.3.2.1 --- .travis.yml | 2 +- CHANGELOG.md | 4 ++++ Dockerfile-server | 6 +++--- config.env | 2 +- docs/security.md | 2 +- docs/testing.md | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a205dbb3..0de4b20c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: global: - MAIN_BRANCH=v9.3.2 - TAGCACHE_FILE=tagcache - - RELEASE=r2 + - RELEASE=r1 go_import_path: "github.com/ibm-messaging/mq-container" diff --git a/CHANGELOG.md b/CHANGELOG.md index d4507654..0525acde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 9.3.2.1 (2023-04) + +* Updated to MQ version 9.3.2.1 + ## 9.3.2.0 (2023-02) * Updated to MQ version 9.3.2.0 diff --git a/Dockerfile-server b/Dockerfile-server index d7dfc19a..29656aac 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -13,11 +13,11 @@ # limitations under the License. ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal -ARG BASE_TAG=8.7-1085 +ARG BASE_TAG=8.7-1107 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.18.9-13 +ARG BUILDER_TAG=1.18.10-1 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container -ARG MQ_ARCHIVE="downloads/9.3.2.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" +ARG MQ_ARCHIVE="downloads/9.3.2.1-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 3b70a2f7..203cf275 100644 --- a/config.env +++ b/config.env @@ -1,6 +1,6 @@ ########################################################################################################################################################### # MQ_VERSION is the fully qualified MQ version number to build -MQ_VERSION ?= 9.3.2.0 +MQ_VERSION ?= 9.3.2.1 ########################################################################################################################################################### diff --git a/docs/security.md b/docs/security.md index 83f43099..175bef9a 100644 --- a/docs/security.md +++ b/docs/security.md @@ -16,5 +16,5 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - ibm-mqadvanced-server:9.3.2.0-amd64 + ibm-mqadvanced-server:9.3.2.1-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index 604019af..86a2f40e 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -24,7 +24,7 @@ make test-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.3.2.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.2.1-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 582030e1901b7c62dbce3528e954edffd450499d Mon Sep 17 00:00:00 2001 From: Alec-Painter Date: Tue, 11 Apr 2023 12:56:53 +0100 Subject: [PATCH 4/9] updated missed go version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0de4b20c..97623c37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required language: go go: - - "1.18.9" + - "1.18.10" services: - docker From e621b3d43eb467e3693127d6ff62636e08124a9c Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Thu, 4 May 2023 11:27:35 +0100 Subject: [PATCH 5/9] Update version for 9.3.2.1-r2 (May 2.3.3 release) --- .travis.yml | 2 +- Dockerfile-server | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 97623c37..7b319f14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: global: - MAIN_BRANCH=v9.3.2 - TAGCACHE_FILE=tagcache - - RELEASE=r1 + - RELEASE=r2 go_import_path: "github.com/ibm-messaging/mq-container" diff --git a/Dockerfile-server b/Dockerfile-server index 29656aac..119207c0 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -15,7 +15,7 @@ ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal ARG BASE_TAG=8.7-1107 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.18.10-1 +ARG BUILDER_TAG=1.18.10-1.1682304657 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG MQ_ARCHIVE="downloads/9.3.2.1-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" From 91c44ffa0da9b320e2531d3d6a49d5c6864491e8 Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Fri, 5 May 2023 09:54:50 +0100 Subject: [PATCH 6/9] Update go version (CD) --- Dockerfile-server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-server b/Dockerfile-server index 119207c0..ab433cb0 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -15,7 +15,7 @@ ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-minimal ARG BASE_TAG=8.7-1107 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.18.10-1.1682304657 +ARG BUILDER_TAG=1.18.10-1.1683014505 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG MQ_ARCHIVE="downloads/9.3.2.1-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" From 86d3463b795535b7753c82b04656082287b6dc9a Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Wed, 17 May 2023 10:36:06 +0100 Subject: [PATCH 7/9] Update GO and UBI (CD) --- .travis.yml | 2 +- Dockerfile-server | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b319f14..0987ab98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required language: go go: - - "1.18.10" + - "1.19.6" services: - docker diff --git a/Dockerfile-server b/Dockerfile-server index ab433cb0..0e63766d 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.7-1107 +ARG BASE_TAG=8.8-860 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.18.10-1.1683014505 +ARG BUILDER_TAG=1.19.6-4 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container ARG MQ_ARCHIVE="downloads/9.3.2.1-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz" From 8e9e0dad152bff562ccd5761d6c123f43e90e97a Mon Sep 17 00:00:00 2001 From: Tom Jefferson Date: Wed, 17 May 2023 15:29:06 +0100 Subject: [PATCH 8/9] Update go mod to 1.19 --- go.mod | 2 +- test/docker/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 0aaf0cf1..de1ed014 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ibm-messaging/mq-container -go 1.18 +go 1.19 require ( github.com/genuinetools/amicontained v0.4.3 diff --git a/test/docker/go.mod b/test/docker/go.mod index d6fb6538..963cad60 100644 --- a/test/docker/go.mod +++ b/test/docker/go.mod @@ -1,6 +1,6 @@ module github.com/ibm-messaging/mq-container/test/docker -go 1.18 +go 1.19 require ( // Note: This is not actually Docker v17.12! From c9972cbb426bc8bc2a746e5b8d26f4ea60c39b70 Mon Sep 17 00:00:00 2001 From: Adam Shannon Date: Fri, 9 Jun 2023 09:24:34 -0500 Subject: [PATCH 9/9] fix: use better "ps" format During emulation the running processes can contain binary names which trip up detecting if a process is already running. Using the comm format will print the running binaries without arguments. Previous: https://github.com/ibm-messaging/mq-container/pull/524 Issue: https://github.com/ibm-messaging/mq-container/issues/476 --- cmd/runmqserver/process.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/runmqserver/process.go b/cmd/runmqserver/process.go index dafd9b6c..ade1b428 100644 --- a/cmd/runmqserver/process.go +++ b/cmd/runmqserver/process.go @@ -43,7 +43,7 @@ func verifySingleProcess() error { // Verifies that there is only one instance running of the given program name. func verifyOnlyOne(programName string) (int, error) { // #nosec G104 - out, _, _ := command.Run("ps", "-e", "--format", "cmd") + out, _, _ := command.Run("ps", "-e", "--format", "comm") //if this goes wrong then assume we are the only one numOfProg := strings.Count(out, programName) if numOfProg != 1 {