From 4b19af1dfe1e699b2d5b74b3bda1f218bdf53c7e Mon Sep 17 00:00:00 2001 From: Luke Powlett Date: Wed, 24 Jun 2020 17:01:57 +0100 Subject: [PATCH] Updated to MQ v9.2.0 --- .travis.yml | 14 +++++++------- Makefile | 2 +- docs/security.md | 4 ++-- docs/testing.md | 6 +++--- manifests/dockerhub/manifest-latest.yaml | 10 +--------- 5 files changed, 14 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f6220f..3773eb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,15 +41,15 @@ jobs: if: branch != private-master AND tag IS blank os: linux env: - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh - if: branch = private-master OR tag =~ ^release-candidate* name: "Multi-Arch AMD64 build" os: linux env: - BUILD_ALL=true - - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_AMD64 - - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_AMD64 + - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_AMD64 + - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64 script: bash -e travis-build-scripts/run.sh # - if: branch = private-master OR tag =~ ^release-candidate* # name: "Multi-Arch PPC64LE build" @@ -57,8 +57,8 @@ jobs: # env: # - BUILD_ALL=true # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - # # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_PPC64LE - # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_PPC64LE + # # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_PPC64LE + # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_PPC64LE # script: bash -e travis-build-scripts/run.sh # - if: branch = private-master OR tag =~ ^release-candidate* # name: "Multi-Arch S390X build" @@ -66,8 +66,8 @@ jobs: # env: # - BUILD_ALL=true # - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics" - # # - MQ_ARCHIVE_REPOSITORY=$MQ_915_ARCHIVE_REPOSITORY_S390X - # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_915_ARCHIVE_REPOSITORY_DEV_S390X + # # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X + # - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X # script: bash -e travis-build-scripts/run.sh before_install: diff --git a/Makefile b/Makefile index 2189899..bf1de6f 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ # RELEASE shows what release of the container code has been built RELEASE ?= # MQ_VERSION is the fully qualified MQ version number to build -MQ_VERSION ?= 9.1.5.0 +MQ_VERSION ?= 9.2.0.0 # MQ_ARCHIVE_REPOSITORY is a remote repository from which to pull the MQ_ARCHIVE (if required) MQ_ARCHIVE_REPOSITORY ?= # MQ_ARCHIVE_REPOSITORY_DEV is a remote repository from which to pull the MQ_ARCHIVE_DEV (if required) diff --git a/docs/security.md b/docs/security.md index d327d96..779efdf 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.1.5.0-amd64 + ibm-mqadvanced-server:9.2.0.0-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.1.5.0-amd64 + ibm-mqadvanced-server-dev:9.2.0.0-amd64 ``` diff --git a/docs/testing.md b/docs/testing.md index 43d01f3..07bf3a0 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.1.5.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.0.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: @@ -32,10 +32,10 @@ You can pass parameters to `go test` with an environment variable. For example, TEST_OPTS_DOCKER="-run TestGoldenPath" make test-advancedserver ``` -You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `ibm-mqadvanced-server:9.1.5.0-amd64`: +You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `ibm-mqadvanced-server:9.2.0.0-amd64`: ``` -MQ_VERSION=9.1.5.0 make test-advancedserver +MQ_VERSION=9.2.0.0 make test-advancedserver ``` ### Running the Docker tests with code coverage diff --git a/manifests/dockerhub/manifest-latest.yaml b/manifests/dockerhub/manifest-latest.yaml index 0dfbabc..cdf9821 100644 --- a/manifests/dockerhub/manifest-latest.yaml +++ b/manifests/dockerhub/manifest-latest.yaml @@ -14,15 +14,7 @@ image: ibmcom/mq:latest manifests: - - image: ibmcom/mq:9.1.5.0-r1-amd64 + - image: ibmcom/mq:9.2.0.0-r1-amd64 platform: architecture: amd64 os: linux - - image: ibmcom/mq:9.1.5.0-r1-ppc64le - platform: - architecture: ppc64le - os: linux - - image: ibmcom/mq:9.1.5.0-r1-s390x - platform: - architecture: s390x - os: linux