From cd69f6287f2e045e6a4c5df1cd4b4ea4ab45efb5 Mon Sep 17 00:00:00 2001 From: Luke Powlett Date: Fri, 24 Jul 2020 16:52:59 +0100 Subject: [PATCH] MQ 9.2 doc updates --- CHANGELOG.md | 2 +- Makefile | 12 ++++++++---- docs/building.md | 6 +++--- docs/developer-config.md | 2 +- docs/usage.md | 9 ++------- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01eaf79..0758a40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 9.2.0.0 (2020-07-23) -* Updated to MQ version 9.2.0.0 +* Updated to [MQ version 9.2.0.0](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.2.0/com.ibm.mq.pro.doc/q113110_.htm) * Use `-ic` arguments with `crtmqm` to process MQSC files in `/etc/mqm`. Replaces previous use of "runmqsc" commands ## 9.1.5.0 (2020-04-02) diff --git a/Makefile b/Makefile index c7e3883..5b7af54 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,10 @@ MQ_ARCHIVE_REPOSITORY_USER ?= MQ_ARCHIVE_REPOSITORY_CREDENTIAL ?= # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can # be installed. Does not apply to MQ Advanced for Developers -MQ_ARCHIVE ?= $(MQ_VERSION)-IBM-MQ-Advanced-$(MQ_ARCHIVE_TYPE)$(MQ_ARCHIVE_ARCH).tar.gz +MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION_VRM)_$(MQ_ARCHIVE_TYPE)_$(MQ_ARCHIVE_ARCH)_NOINST.tar.gz # MQ_ARCHIVE_DEV is the name of the file, under the downloads directory, from which MQ Advanced # for Developers can be installed -MQ_ARCHIVE_DEV ?= $(MQ_VERSION)-IBM-MQ-Advanced-for-Developers-Non-Install-$(MQ_ARCHIVE_TYPE)$(MQ_ARCHIVE_ARCH).tar.gz +MQ_ARCHIVE_DEV ?= $(MQ_VERSION)-IBM-MQ-Advanced-for-Developers-Non-Install-$(MQ_ARCHIVE_DEV_TYPE)$(MQ_ARCHIVE_DEV_ARCH).tar.gz # MQ_SDK_ARCHIVE specifies the archive to use for building the golang programs. Defaults vary on developer or advanced. MQ_SDK_ARCHIVE ?= $(MQ_ARCHIVE_DEV_$(MQ_VERSION)) # Options to `go test` for the Docker tests @@ -65,7 +65,8 @@ ARCH ?= $(if $(findstring x86_64,$(shell uname -m)),amd64,$(shell uname -m)) # Other variables ############################################################################### GO_PKG_DIRS = ./cmd ./internal ./test -MQ_ARCHIVE_TYPE=Linux +MQ_ARCHIVE_TYPE=LINUX +MQ_ARCHIVE_DEV_TYPE=Linux # BUILD_SERVER_CONTAINER is the name of the web server container used at build time BUILD_SERVER_CONTAINER=build-server # NUM_CPU is the number of CPUs available to Docker. Used to control how many @@ -82,6 +83,8 @@ IMAGE_REVISION=$(shell git rev-parse HEAD) IMAGE_SOURCE=$(shell git config --get remote.origin.url) EMPTY:= SPACE:= $(EMPTY) $(EMPTY) +# MQ_VERSION_VRM is MQ_VERSION with only the Version, Release and Modifier fields (no Fix field). e.g. 9.2.0 instead of 9.2.0.0 +MQ_VERSION_VRM=$(subst $(SPACE),.,$(wordlist 1,3,$(subst .,$(SPACE),$(MQ_VERSION)))) ifneq (,$(findstring Microsoft,$(shell uname -r))) DOWNLOADS_DIR=$(patsubst /mnt/c%,C:%,$(realpath ./downloads/)) @@ -93,7 +96,8 @@ endif # Try to figure out which archive to use from the architecture ifeq "$(ARCH)" "amd64" - MQ_ARCHIVE_ARCH=X64 + MQ_ARCHIVE_ARCH=X86-64 + MQ_ARCHIVE_DEV_ARCH=X64 else ifeq "$(ARCH)" "ppc64le" MQ_ARCHIVE_ARCH=PPC64LE else ifeq "$(ARCH)" "s390x" diff --git a/docs/building.md b/docs/building.md index 7a2cfbb..e5afa69 100644 --- a/docs/building.md +++ b/docs/building.md @@ -16,11 +16,11 @@ You will also need a [Red Hat Account](https://access.redhat.com) to be able to 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.1.4_LINUX_X86-64.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.0_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` -> **Warning**: Note that MQ offers two different sets of packaging on Linux: one is called "MQ for Linux" and contains RPM files for installing on Red Hat Enterprise Linux and SUSE Linux Enterprise Server; the other is for Ubuntu. The MQ container build uses a Red Hat Universal Base Image, so you need the "MQ for Linux" RPM files. +> **Warning**: Note that from MQ 9.2.X, the MQ container build uses a 'No-Install' MQ Package, available under `IBM MQ V9.2.x Continuous Delivery Release components eAssembly, part no. CJ7CNML` If you have an MQ archive file with a different file name, you can specify a particular file (which must be in the `downloads` directory). You should also specify the MQ version, so that the resulting image is tagged correctly, for example: @@ -37,4 +37,4 @@ You can use the environment variable `MQ_ARCHIVE_DEV` to specify an alternative ## Installed components -This image includes the core MQ server, Java, language packs, GSKit, and web server. This can be configured by setting the `MQ_PACKAGES` argument to `make`. +This image includes the core MQ server, Java, language packs, GSKit, and web server. This is configured in the `Generate MQ package in INSTALLATION_DIR` section [here](../install-mq.sh), with the configured options being picked up at build time. diff --git a/docs/developer-config.md b/docs/developer-config.md index 180c090..cce7de8 100644 --- a/docs/developer-config.md +++ b/docs/developer-config.md @@ -14,7 +14,7 @@ The MQ Developer Defaults supports some customization options, these are all con The following users are created: -* User **admin** for administration (in the `mqm` group). Default password is **passw0rd**. +* User **admin** for administration. Default password is **passw0rd**. * User **app** for messaging (in a group called `mqclient`). No password by default. Users in `mqclient` group have been given access connect to all queues and topics starting with `DEV.**` and have `put`, `get`, `pub`, `sub`, `browse` and `inq` permissions. diff --git a/docs/usage.md b/docs/usage.md index 9e1e716..b254cf7 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -60,23 +60,18 @@ You can customize the configuration in several ways: 1. For getting started, you can use the [default developer configuration](developer-config.md), which is available out-of-the-box for the MQ Advanced for Developers image 2. By creating your own image and adding your own MQSC file into the `/etc/mqm` directory on the image. This file will be run when your queue manager is created. -3. By using [remote MQ administration](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.1.0/com.ibm.mq.adm.doc/q021090_.htm), via an MQ command server, the MQ HTTP APIs, or using a tool such as the MQ web console or MQ Explorer. +3. By using [remote MQ administration](https://www.ibm.com/support/knowledgecenter/SSFKSJ_9.2.0/com.ibm.mq.adm.doc/q021090_.htm), via an MQ command server, the MQ HTTP APIs, or using a tool such as the MQ web console or MQ Explorer. Note that a listener is always created on port 1414 inside the container. This port can be mapped to any port on the Docker host. -The following is an *example* `Dockerfile` for creating your own pre-configured image, which adds a custom MQ configuration file, and an administrative user `alice`. Note that it is not normally recommended to include passwords in this way: +The following is an *example* `Dockerfile` for creating your own pre-configured image, which adds a custom MQ configuration file: ```dockerfile FROM ibmcom/mq -USER root -RUN useradd alice -G mqm && \ - echo alice:passw0rd | chpasswd USER 1001 COPY 20-config.mqsc /etc/mqm/ ``` -The `USER` instructions are necessary to ensure that the `useradd` and `chpasswd` commands are run as the root user. - Here is an example corresponding `20-config.mqsc` script, which creates two local queues: ```mqsc