diff --git a/.travis.yml b/.travis.yml index 7e2da9e..a13b440 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ env: global: - MAIN_BRANCH=private-master - TAGCACHE_FILE=tagcache - - RELEASE=r2 + - RELEASE=r1 go_import_path: "github.com/ibm-messaging/mq-container" @@ -42,7 +42,7 @@ jobs: name: "Basic AMD64 build" os: linux env: - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_932_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh # CD Build @@ -58,8 +58,8 @@ jobs: os: linux env: - BUILD_ALL=true - - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_AMD64 - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_932_ARCHIVE_REPOSITORY_AMD64 + - 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* @@ -68,8 +68,8 @@ jobs: env: - BUILD_ALL=true - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_S390X - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_ARCHIVE_REPOSITORY_DEV_S390X + - MQ_ARCHIVE_REPOSITORY=$MQ_932_ARCHIVE_REPOSITORY_S390X + - 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* @@ -78,8 +78,8 @@ jobs: env: - BUILD_ALL=true - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_PPC64LE - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_ARCHIVE_REPOSITORY_DEV_PPC64LE + - MQ_ARCHIVE_REPOSITORY=$MQ_932_ARCHIVE_REPOSITORY_PPC64LE + - 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* diff --git a/CHANGELOG.md b/CHANGELOG.md index 54abdb4..78676c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 9.3.2.0 (2023-02) + +* Updated to MQ version 9.3.2.0 + ## 9.3.1.0-r2 (2022-11) * Queue manager attribute SSLKEYR is now set to blank instead of '/run/runmqserver/tls/key' if key and certificate are not supplied. diff --git a/Dockerfile-server b/Dockerfile-server index 747ba3d..34a1760 100644 --- a/Dockerfile-server +++ b/Dockerfile-server @@ -17,7 +17,7 @@ ARG BASE_TAG=8.7-923 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset ARG BUILDER_TAG=1.17.12-11 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.1.0-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.3.2.0-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 79c9320..3b70a2f 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.1.0 +MQ_VERSION ?= 9.3.2.0 ########################################################################################################################################################### diff --git a/docs/security.md b/docs/security.md index 04be963..83f4309 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.1.0-amd64 + ibm-mqadvanced-server:9.3.2.0-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index 9e1e2ce..604019a 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.1.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.2.0-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: