diff --git a/.travis.yml b/.travis.yml index 2b54fcc..5c8d3bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ sudo: required language: go go: - - "1.17.7" + - "1.17.10" services: - docker @@ -42,7 +42,7 @@ jobs: name: "Basic AMD64 build" os: linux env: - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_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_930_ARCHIVE_REPOSITORY_AMD64 - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_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_930_ARCHIVE_REPOSITORY_S390X - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_S390X + - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_S390X + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_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_930_ARCHIVE_REPOSITORY_PPC64LE - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_930_ARCHIVE_REPOSITORY_DEV_PPC64LE + - MQ_ARCHIVE_REPOSITORY=$MQ_931_ARCHIVE_REPOSITORY_PPC64LE + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_931_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 d9a8410..3a09528 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 9.3.1.0 (2022-10) + +* Updated to MQ version 9.3.1.0 + ## 9.3.0.0 (2022-06) * Updated to MQ version 9.3.0.0 diff --git a/Dockerfile-server b/Dockerfile-server index a43ca7e..9fad2a1 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.6-751.1655117800 +ARG BASE_TAG=8.6-854 ARG BUILDER_IMAGE=registry.access.redhat.com/ubi8/go-toolset -ARG BUILDER_TAG=1.17.7-13.1655148239 +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.3.0.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.1.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 7dbef93..79c9320 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.0.0 +MQ_VERSION ?= 9.3.1.0 ########################################################################################################################################################### diff --git a/docs/security.md b/docs/security.md index a98d196..04be963 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.0.0-amd64 + ibm-mqadvanced-server:9.3.1.0-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index f6fc286..5f5a668 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -24,7 +24,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.3.0.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.3.1.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: