[ci skip]: Setting up v9.2.1 branch

Merge pull request #132 from mq-cloudpak/drb-ubigo
Update UBI and Go builder
2020-12-16 20:25:35 +00:00 · 2020-12-16 11:12:55 +00:00 · 2020-12-16 10:48:36 +00:00 · 2020-12-14 17:09:04 +00:00 · 2020-12-14 10:39:04 +00:00 · 2020-12-04 18:01:46 +05:30
11 changed files with 59 additions and 29 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,10 +25,10 @@ services:

 env:
  global:
-    - MAIN_BRANCH=private-master
+    - MAIN_BRANCH=v9.2.1
    - MQ_LTS_VERSION=9.2.0.1
    - TAGCACHE_FILE=tagcache
-    - RELEASE=r2
+    - RELEASE=r1
    - RELEASE_LTS=r1

 go_import_path: "github.com/ibm-messaging/mq-container"
@@ -40,50 +40,50 @@ 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.2.1 AND tag IS blank
      name: "Basic AMD64 build"
      os: linux
      env:
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_AMD64
      script: bash -e travis-build-scripts/run.sh

    # CD Build

    - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 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.2.1 OR tag =~ ^release-candidate*
      name: "Multi-Arch AMD64 build"
      os: linux
      env:
        - BUILD_ALL=true
-        - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_AMD64
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_AMD64
+        - MQ_ARCHIVE_REPOSITORY=$MQ_921_ARCHIVE_REPOSITORY_AMD64
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_AMD64
      script: bash -e travis-build-scripts/run.sh
-    # - if: branch = private-master OR tag =~ ^release-candidate*
+    # - if: branch = v9.2.1 OR tag =~ ^release-candidate*
    #   name: "Multi-Arch PPC64LE build"
    #   os: linux-ppc64le
    #   env:
    #     - BUILD_ALL=true
    #     - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-    #     # - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_PPC64LE
-    #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_PPC64LE
+    #     # - MQ_ARCHIVE_REPOSITORY=$MQ_921_ARCHIVE_REPOSITORY_PPC64LE
+    #     - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_PPC64LE
    #   script: bash -e travis-build-scripts/run.sh
    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
      name: "Multi-Arch S390X build"
      os: linux-s390
      env:
        - BUILD_ALL=true
        - TEST_OPTS_DOCKER="-run TestGoldenPathWithMetrics"
-        - MQ_ARCHIVE_REPOSITORY=$MQ_920_ARCHIVE_REPOSITORY_S390X
-        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_920_ARCHIVE_REPOSITORY_DEV_S390X
+        - MQ_ARCHIVE_REPOSITORY=$MQ_921_ARCHIVE_REPOSITORY_S390X
+        - MQ_ARCHIVE_REPOSITORY_DEV=$MQ_921_ARCHIVE_REPOSITORY_DEV_S390X
      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.2.1 AND type != pull_request OR tag =~ ^release-candidate*
      name: "Push Manifest-list to registry"
      env:
        - PUSH_MANIFEST_ONLY=true
@@ -92,7 +92,7 @@ jobs:
      # LTS Build

    - stage: global-tag
-      if: branch = private-master AND type != pull_request OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 AND type != pull_request OR tag =~ ^release-candidate*
      name: "Generate Global Tag"
      os: linux
      env:
@@ -102,7 +102,7 @@ jobs:
        - RELEASE=$RELEASE_LTS
      script: bash -e travis-build-scripts/global-tag.sh
    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
      name: "Multi-Arch AMD64 build"
      os: linux
      env:
@@ -113,7 +113,7 @@ jobs:
        - RELEASE=$RELEASE_LTS
      script: bash -e travis-build-scripts/run.sh
    - stage: build
-      if: branch = private-master OR tag =~ ^release-candidate*
+      if: branch = v9.2.1 OR tag =~ ^release-candidate*
      name: "Multi-Arch S390X build"
      os: linux-s390
      env:
@@ -125,7 +125,7 @@ jobs:
        - RELEASE=$RELEASE_LTS
      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.2.1 AND type != pull_request OR tag =~ ^release-candidate*
      name: "Push Manifest-list to registry"
      env:
        - LTS=true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log

+## 9.2.1.0 (2020-02-18)
+
+* Updated to MQ version 9.2.1.0
+
+
 ## 9.2.0.1-LTS (2020-12-04)

 * Added support for MQ Long Term Support (production licensed only) in the mq-container
--- a/8
+++ b/8
@@ -13,13 +13,13 @@
 # limitations under the License.

 ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
-ARG BASE_TAG=8.3-201
+ARG BASE_TAG=8.3-230
 ARG GO_WORKDIR=/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.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.2.1.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################
 # Build stage to build Go code
 ###############################################################################
-FROM docker.io/golang:1.14.12 as builder
+FROM docker.io/golang:1.14.13 as builder
 # The URL to download the MQ installer from in tar.gz format
 # This assumes an archive containing the MQ Non-Install packages
 ARG MQ_URL
@@ -158,7 +158,7 @@ RUN chown -R 1001:root /etc/mqm/* \
  && install --directory --mode 2775 --owner 1001 --group root /run/runmqdevserver
 ENV MQ_ENABLE_EMBEDDED_WEB_SERVER=1 MQ_GENERATE_CERTIFICATE_HOSTNAME=localhost
 ENV LD_LIBRARY_PATH=/opt/mqm/lib64
-ENV MQS_PERMIT_UNKNOWN_ID=true
 ENV MQ_CONNAUTH_USE_HTP=true
+ENV MQS_PERMIT_UNKNOWN_ID=true
 USER 1001
 ENTRYPOINT ["runmqdevserver"]
--- a/cmd/runmqserver/qmgr.go
+++ b/cmd/runmqserver/qmgr.go
@@ -27,6 +27,7 @@ import (
 	"github.com/ibm-messaging/mq-container/internal/command"
 	containerruntime "github.com/ibm-messaging/mq-container/internal/containerruntime"
 	"github.com/ibm-messaging/mq-container/internal/mqscredact"
+	"github.com/ibm-messaging/mq-container/internal/mqversion"
 	"github.com/ibm-messaging/mq-container/internal/ready"
 )

@@ -203,9 +204,24 @@ func getQueueManagerDataDir(mounts map[string]string, name string) string {
 }

 func getCreateQueueManagerArgs(mounts map[string]string, name string, devMode bool) []string {
+
+	mqversionBase := "9.2.1.0"
+
+	// use "UserExternal" only if we are 9.2.1.0 or above.
+	oaVal := "user"
+	mqVersionCheck, err := mqversion.Compare(mqversionBase)
+
+	if err != nil {
+		log.Printf("Error comparing MQ versions for oa,rc: %v", mqVersionCheck)
+	}
+	if mqVersionCheck >= 0 {
+		oaVal = "UserExternal"
+	}
+
+	//build args
 	args := []string{"-ii", "/etc/mqm/", "-ic", "/etc/mqm/", "-q", "-p", "1414"}
 	if devMode {
-		args = append(args, "-oa", "user")
+		args = append(args, "-oa", oaVal)
 	}
 	if _, ok := mounts["/mnt/mqm-log"]; ok {
 		args = append(args, "-ld", "/mnt/mqm-log/log")
--- a/config.env
+++ b/config.env
@@ -1,6 +1,6 @@
 ###########################################################################################################################################################

 # MQ_VERSION is the fully qualified MQ version number to build
-MQ_VERSION ?= 9.2.0.0
+MQ_VERSION ?= 9.2.1.0

 ###########################################################################################################################################################
--- a/docs/building.md
+++ b/docs/building.md
@@ -20,7 +20,7 @@ From MQ 9.2.X, the MQ container adds support for MQ Long Term Support (LTS) **pr
 This procedure works for building the MQ Continuous Delivery release, on `amd64`, `ppc64le` and `s390x` architectures.

 1. Create a `downloads` directory in the root of this repository
-2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/) or [IBM Fix Central](https://www.ibm.com/support/fixcentral), and place the downloaded file (for example, `IBM_MQ_9.2.0_LINUX_X86-64_NOINST.tar.gz`) in the `downloads` directory
+2. Download MQ from [IBM Passport Advantage](https://www.ibm.com/software/passportadvantage/) or [IBM Fix Central](https://www.ibm.com/support/fixcentral), and place the downloaded file (for example, `IBM_MQ_9.2.1_LINUX_X86-64_NOINST.tar.gz`) in the `downloads` directory
 3. Login to the Red Hat Registry: `docker login registry.redhat.io` using your Customer Portal credentials.
 4. Run `make build-advancedserver`

--- 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.0-amd64
+  ibm-mqadvanced-server:9.2.1.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.2.0.0-amd64
+  ibm-mqadvanced-server-dev:9.2.1.0-amd64
 ```
--- 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.0-amd64 make test-advancedserver
+MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.2.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:
--- a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml
+++ b/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml
@@ -36,5 +36,8 @@
    </basicRegistry>
    <variable name="httpHost" value="*"/>
    <variable name="managementMode" value="externallyprovisioned"/>
+    <variable name="mqConsoleEnableUnsafeInline" value="true"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
    <include location="tls.xml"/>
 </server>
--- a/web/installations/Installation1/servers/mqweb/mqwebuser.xml
+++ b/web/installations/Installation1/servers/mqweb/mqwebuser.xml
@@ -21,5 +21,8 @@
        </application-bnd>
    </enterpriseApplication>
    <variable name="httpHost" value="*"/>
+    <variable name="mqConsoleEnableUnsafeInline" value="true"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
    <include location="tls.xml"/>
 </server>
--- a/web/installations/Installation1/servers/mqweb/mqwebuser.xml.tpl
+++ b/web/installations/Installation1/servers/mqweb/mqwebuser.xml.tpl
@@ -38,6 +38,9 @@
    </openidConnectClient>
    <variable name="httpHost" value="*"/>
    <variable name="managementMode" value="externallyprovisioned"/>
+    <variable name="mqConsoleEnableUnsafeInline" value="true"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTHostname" value="${env.MQ_CONSOLE_DEFAULT_CCDT_HOSTNAME}"/>
+    <jndiEntry jndiName="mqConsoleDefaultCCDTPort" value="${env.MQ_CONSOLE_DEFAULT_CCDT_PORT}"/>
    <httpDispatcher enableWelcomePage="false" appOrContextRootMissingMessage='&lt;script&gt;document.location.href="/ibmmq/console";&lt;/script&gt;' />
    <include location="tls.xml"/>
 </server>
Author	SHA1	Message	Date
David Bell	7f85fcf7db	[ci skip]: Setting up v9.2.1 branch	2020-12-16 20:25:35 +00:00
David R Bell	54824879c5	Merge pull request #132 from mq-cloudpak/drb-ubigo Update UBI and Go builder	2020-12-16 11:12:55 +00:00
David Bell	bf8580248b	Update UBI and Go builder	2020-12-16 10:48:36 +00:00
Amrit K Kandola	e1978541db	add variable in mqwebuser.xml to fix the webconsole issue (#131 ) * add variable in mqwebuser.xml to fix the webconsole issue * add fix to the other mqwebuser.xml files	2020-12-14 17:09:04 +00:00
Stephen Marshall	aa7580aa5a	Set Web-Console CCDT values	2020-12-14 10:39:04 +00:00
Paras Mamgain	4366cd8c81	Merge pull request #129 from mq-cloudpak/MQ-921-upgrade updating release version to r1	2020-12-04 18:01:46 +05:30
mamgainp	2a5242a4d9	updating release version to r1	2020-12-04 17:37:50 +05:30
Paras Mamgain	a4dc545a4f	Merge pull request #128 from mq-cloudpak/MQ-921-upgrade updating mq 9200 to 9210	2020-12-04 15:37:02 +05:30
VENKATA KIRAN KUMAR DARBHA	f16ce5e4a4	Merge pull request #112 from mq-cloudpak/UserExternal User external	2020-12-04 15:13:21 +05:30
mamgainp	03cdf67439	Merge branch 'UserExternal' into MQ-921-upgrade	2020-12-04 09:53:58 +05:30
mamgainp	e8e86dcc92	updating mq 9200 to 9210	2020-12-02 12:11:55 +05:30
kirandarbha	a3e3b0d8c6	update version-check condition	2020-11-03 15:20:13 +05:30
kirandarbha	23f31b1639	updating to use mqversion util	2020-11-03 10:54:13 +05:30
kirandarbha	8d164340c6	Merge branch 'private-master' into UserExternal	2020-11-03 10:06:23 +05:30
kirandarbha	f39f90728f	adding newly introduced UserExternal to crtmqm Removing redundant env variable in dockerfile userexternal only if gt 9201 restore env variable for UNKNOWN_ID	2020-11-02 18:01:54 +05:30