From f3c858184f74f22fd9ef82f18d89a74849b6c847 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Tue, 5 Feb 2019 13:51:15 +0000 Subject: [PATCH 1/7] use correct download files in RHEL build process --- Makefile-RHEL | 31 ++++++++++++++++++++----------- Makefile-UBUNTU | 8 ++++++-- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/Makefile-RHEL b/Makefile-RHEL index af0bd47..ab1b2bf 100644 --- a/Makefile-RHEL +++ b/Makefile-RHEL @@ -23,7 +23,7 @@ MQ_VERSION ?= 9.1.1.0 # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can # be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture # Does not apply to MQ Advanced for Developers. -MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION)_LINUX_$(MQ_ARCHIVE_ARCH).tar.gz +MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION_VRM)_LINUX_$(MQ_ARCHIVE_ARCH).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_ARCHIVE_DEV_$(MQ_VERSION)) @@ -56,6 +56,10 @@ DEV_JMS_IMAGE=mq-dev-jms-test:latest IMAGE_REVISION=$(shell git rev-parse HEAD) IMAGE_SOURCE=$(shell git config --get remote.origin.url) MQDEV= +EMPTY:= +SPACE:= $(EMPTY) $(EMPTY) +# MQ_VERSION_VRM is MQ_VERSION with only the Version, Release and Modifier fields (no Fix field). e.g. 9.1.1 instead of 9.1.1.0 +MQ_VERSION_VRM=$(subst $(SPACE),.,$(wordlist 1,3,$(subst .,$(SPACE),$(MQ_VERSION)))) ifneq (,$(findstring Microsoft,$(shell uname -r))) @@ -155,7 +159,7 @@ test-devserver: check-test-prereqs test/docker/vendor .PHONY: build-advancedserver -build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs-ex +build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs $(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER)"$(END))) sudo mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_ADVANCEDSERVER)" "$(MQ_VERSION)" "$(MQDEV)" @@ -163,25 +167,19 @@ build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs-ex .PHONY: build-devserver build-devserver: MQDEV=TRUE build-devserver: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesServer-*.rpm MQSeriesJava*.rpm MQSeriesJRE*.rpm MQSeriesGSKit*.rpm MQSeriesMsg*.rpm MQSeriesSamples*.rpm MQSeriesAMS-*.rpm MQSeriesWeb-*.rpm -build-devserver: check-prereqs downloads/$(MQ_ARCHIVE_DEV) build-go-programs-ex +build-devserver: check-prereqs downloads/$(MQ_ARCHIVE_DEV) build-go-programs $(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER)"$(END))) sudo mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE_DEV)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_DEVSERVER_BASE)" "$(MQ_VERSION)" "$(MQDEV)" sudo mq-advanced-server-rhel/mqdev-buildah.sh "$(MQ_IMAGE_DEVSERVER_BASE)" "$(MQ_IMAGE_DEVSERVER)" "$(MQ_VERSION)" .PHONY: build-mqgolang-sdk -build-mqgolang-sdk: check-prereqs downloads/$(MQ_SDK_ARCHIVE) build-mqgolang-sdk-ex - -.PHONY: build-mqgolang-sdk-ex -build-mqgolang-sdk-ex: +build-mqgolang-sdk: check-prereqs downloads/$(MQ_SDK_ARCHIVE) $(info $(SPACER)$(shell printf $(TITLE)"Build mq-golang SDK"$(END))) sudo mq-advanced-server-rhel/mq-golang-sdk-buildah.sh "$(MQ_SDK_ARCHIVE)" "$(MQ_IMAGE_GOLANG_SDK)" .PHONY: build-go-programs -build-go-programs: check-prereqs downloads/$(MQ_SDK_ARCHIVE) build-go-programs-ex - -.PHONY: build-go-programs-ex -build-go-programs-ex: build-mqgolang-sdk-ex +build-go-programs: check-prereqs downloads/$(MQ_SDK_ARCHIVE) build-mqgolang-sdk $(info $(SPACER)$(shell printf $(TITLE)"Build go programs"$(END))) IMAGE_REVISION=$(IMAGE_REVISION) IMAGE_SOURCE=$(IMAGE_SOURCE) sudo mq-advanced-server-rhel/go-buildah.sh "$(MQ_IMAGE_GOLANG_SDK)" "$(MQDEV)" @@ -192,4 +190,15 @@ build-devjmstest: check-test-prereqs sudo buildah push $(DEV_JMS_IMAGE) docker-daemon:$(DEV_JMS_IMAGE) docker tag docker.io/$(DEV_JMS_IMAGE) $(DEV_JMS_IMAGE) +.PHONY: debug-vars +debug-vars: + @echo MQ_VERSION=$(MQ_VERSION) + @echo MQ_VERSION_VRM=$(MQ_VERSION_VRM) + @echo MQ_ARCHIVE=$(MQ_ARCHIVE) + @echo MQ_SDK_ARCHIVE=$(MQ_SDK_ARCHIVE) + @echo MQ_IMAGE_GOLANG_SDK=$(MQ_IMAGE_GOLANG_SDK) + @echo MQ_IMAGE_DEVSERVER_BASE=$(MQ_IMAGE_DEVSERVER_BASE) + @echo MQ_IMAGE_DEVSERVER=$(MQ_IMAGE_DEVSERVER) + @echo MQ_IMAGE_ADVANCEDSERVER=$(MQ_IMAGE_ADVANCEDSERVER) + include formatting.mk diff --git a/Makefile-UBUNTU b/Makefile-UBUNTU index 0ca502e..d64d152 100644 --- a/Makefile-UBUNTU +++ b/Makefile-UBUNTU @@ -1,4 +1,4 @@ -# © Copyright IBM Corporation 2017, 2018 +# © Copyright IBM Corporation 2017, 2019 # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ MQ_VERSION ?= 9.1.1.0 # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can # be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture # Does not apply to MQ Advanced for Developers. -MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION)_$(MQ_ARCHIVE_TYPE)_$(MQ_ARCHIVE_ARCH).tar.gz +MQ_ARCHIVE ?= IBM_MQ_$(MQ_VERSION_VRM)_$(MQ_ARCHIVE_TYPE)_$(MQ_ARCHIVE_ARCH).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_ARCHIVE_DEV_$(MQ_VERSION)) @@ -62,6 +62,10 @@ DEV_JMS_IMAGE=mq-dev-jms-test # Variables for versioning 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.1.1 instead of 9.1.1.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/)) From 9a8ff9b524632dc2450fd490c5edc19e83a2df43 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Tue, 5 Feb 2019 13:53:59 +0000 Subject: [PATCH 2/7] copy sub-directories under /etc/yum.repos.d --- mq-advanced-server-rhel/mq-buildah.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index 0c138eb..8df50a0 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -62,7 +62,7 @@ readonly mqdev=$5 ############################################################################### # Use the Yum repositories configured on the host -cp /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/ +cp -R /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/ # Install the packages required by MQ yum install -y --installroot=${mnt_mq} --setopt install_weak_deps=false --setopt=tsflags=nodocs --setopt=override_install_langs=en_US.utf8 \ bash \ From 6840a575f94eb42d6da4cced84750a280197a3b3 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Wed, 6 Feb 2019 13:29:44 +0000 Subject: [PATCH 3/7] Fix for building on subscribed and unsubscribed hosts --- mq-advanced-server-rhel/go-buildah.sh | 1 + mq-advanced-server-rhel/mq-buildah.sh | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mq-advanced-server-rhel/go-buildah.sh b/mq-advanced-server-rhel/go-buildah.sh index 9a8d6a0..b010d7b 100755 --- a/mq-advanced-server-rhel/go-buildah.sh +++ b/mq-advanced-server-rhel/go-buildah.sh @@ -41,5 +41,6 @@ podman run \ --env MQDEV=${dev} \ --user $(id -u) \ --rm \ + --network podman \ ${tag} \ bash -c "cd /opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/ && ./mq-advanced-server-rhel/go-build.sh" diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index 8df50a0..22b5177 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -61,10 +61,18 @@ readonly mqdev=$5 # Install MQ server ############################################################################### -# Use the Yum repositories configured on the host -cp -R /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/ -# Install the packages required by MQ -yum install -y --installroot=${mnt_mq} --setopt install_weak_deps=false --setopt=tsflags=nodocs --setopt=override_install_langs=en_US.utf8 \ +microdnf_opts="--nodocs" +# Check whether the host is registered with Red Hat +subscription-manager status +if [ "$?" -eq "0" ]; then + # Host is subscribed, but the minimal image has no enabled repos + microdnf_opts="${microdnf_opts} --enablerepo=rhel-7-server-rpms" + # buildah run ${ctr_mq} -- microdnf microdnf --enablerepo=rhel-7-server-rpms --nodocs install ${prereq_packages} +else + # Use the Yum repositories configured on the host + cp -R /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/ +fi +buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \ bash \ bc \ coreutils \ @@ -81,16 +89,15 @@ yum install -y --installroot=${mnt_mq} --setopt install_weak_deps=false --setopt util-linux \ which +# Clean up cached files +buildah run ${ctr_mq} -- microdnf ${microdnf_opts} clean all +rm -rf ${mnt_mq}/etc/yum.repos.d/* + groupadd --root ${mnt_mq} --system --gid 888 mqm useradd --root ${mnt_mq} --system --uid 888 --gid mqm mqm usermod --root ${mnt_mq} -aG root mqm usermod --root ${mnt_mq} -aG mqm root -# Clean up cached files -yum clean --installroot=${mnt_mq} all -rm -rf ${mnt_mq}/var/cache/yum/* -rm -rf ${mnt_mq}/etc/yum.repos.d/* - # Install MQ server packages into the MQ builder image ./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${archive}" "${packages}" From 599f5f4b5385eb9c70e6c0efcfbf959fa7ab947d Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Tue, 29 Jan 2019 11:13:40 +0000 Subject: [PATCH 4/7] Build on host with SELinux enabled --- mq-advanced-server-rhel/go-buildah.sh | 4 +++- mq-advanced-server-rhel/install-mq-rhel.sh | 7 ++++--- mq-advanced-server-rhel/mq-buildah.sh | 18 +++++++++--------- mq-advanced-server-rhel/mqdev-buildah.sh | 15 ++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mq-advanced-server-rhel/go-buildah.sh b/mq-advanced-server-rhel/go-buildah.sh index b010d7b..c0d411f 100755 --- a/mq-advanced-server-rhel/go-buildah.sh +++ b/mq-advanced-server-rhel/go-buildah.sh @@ -34,8 +34,10 @@ readonly dev=$2 IMAGE_REVISION=${IMAGE_REVISION:="Not Applicable"} IMAGE_SOURCE=${IMAGE_SOURCE:="Not Applicable"} +# Run the build in a container +# Note the ":Z" on the volume is to allow the container to access the files when SELinux is enabled podman run \ - --volume ${PWD}:/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/ \ + --volume ${PWD}:/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container/:Z \ --env IMAGE_REVISION="$IMAGE_REVISION" \ --env IMAGE_SOURCE="$IMAGE_SOURCE" \ --env MQDEV=${dev} \ diff --git a/mq-advanced-server-rhel/install-mq-rhel.sh b/mq-advanced-server-rhel/install-mq-rhel.sh index e880fc0..9396bbe 100755 --- a/mq-advanced-server-rhel/install-mq-rhel.sh +++ b/mq-advanced-server-rhel/install-mq-rhel.sh @@ -46,9 +46,10 @@ fi # Accept the MQ license -buildah run --volume ${dir_extract}:/mnt/mq-download $ctr_mq -- /mnt/mq-download/MQServer/mqlicense.sh -text_only -accept +buildah run --user root --volume ${dir_extract}:/mnt/mq-download:Z $ctr_mq -- /mnt/mq-download/MQServer/mqlicense.sh -text_only -accept -buildah run --volume ${dir_extract}:/mnt/mq-download $ctr_mq -- bash -c "cd /mnt/mq-download/MQServer && rpm -ivh $mq_packages" +# Install MQ +buildah run --user root --volume ${dir_extract}:/mnt/mq-download:Z $ctr_mq -- bash -c "cd /mnt/mq-download/MQServer && rpm -ivh $mq_packages" rm -rf ${dir_extract}/MQServer @@ -71,7 +72,7 @@ rm -rf $mnt_mq/var/mqm mkdir -p $mnt_mq/mnt/mqm # Create a symlink for /var/mqm -> /mnt/mqm/data -buildah run $ctr_mq -- ln -s /mnt/mqm/data /var/mqm +buildah run --user root $ctr_mq -- ln -s /mnt/mqm/data /var/mqm # Optional: Set these values for the IBM Cloud Vulnerability Report sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t90/' $mnt_mq/etc/login.defs diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index 22b5177..a1c0176 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -16,8 +16,6 @@ # limitations under the License. # Build a RHEL image, using the buildah tool -# Usage -# mq-buildah.sh ARCHIVE-NAME PACKAGES set -x set -e @@ -56,6 +54,8 @@ readonly packages=$2 readonly tag=$3 readonly version=$4 readonly mqdev=$5 +readonly mqm_uid=888 +readonly mqm_gid=888 ############################################################################### # Install MQ server @@ -93,10 +93,10 @@ buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \ buildah run ${ctr_mq} -- microdnf ${microdnf_opts} clean all rm -rf ${mnt_mq}/etc/yum.repos.d/* -groupadd --root ${mnt_mq} --system --gid 888 mqm -useradd --root ${mnt_mq} --system --uid 888 --gid mqm mqm -usermod --root ${mnt_mq} -aG root mqm -usermod --root ${mnt_mq} -aG mqm root +buildah run --user root $ctr_mq -- groupadd --system --gid ${mqm_gid} mqm +buildah run --user root $ctr_mq -- useradd --system --uid ${mqm_uid} --gid mqm mqm +buildah run --user root $ctr_mq -- usermod -aG root mqm +buildah run --user root $ctr_mq -- usermod -aG mqm root # Install MQ server packages into the MQ builder image ./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${archive}" "${packages}" @@ -106,9 +106,9 @@ mkdir -p ${mnt_mq}/etc/mqm chown 888:888 ${mnt_mq}/etc/mqm # Install the Go binaries into the image -install --mode 0750 --owner 888 --group 888 ./build/runmqserver ${mnt_mq}/usr/local/bin/ -install --mode 6750 --owner 888 --group 888 ./build/chk* ${mnt_mq}/usr/local/bin/ -install --mode 0750 --owner 888 --group 888 ./NOTICES.txt ${mnt_mq}/opt/mqm/licenses/notices-container.txt +install --mode 0750 --owner ${mqm_uid} --group 0 ./build/runmqserver ${mnt_mq}/usr/local/bin/ +install --mode 6750 --owner ${mqm_uid} --group 0 ./build/chk* ${mnt_mq}/usr/local/bin/ +install --mode 0750 --owner ${mqm_uid} --group 0 ./NOTICES.txt ${mnt_mq}/opt/mqm/licenses/notices-container.txt ############################################################################### # Final Buildah commands diff --git a/mq-advanced-server-rhel/mqdev-buildah.sh b/mq-advanced-server-rhel/mqdev-buildah.sh index e32ea68..5c92847 100755 --- a/mq-advanced-server-rhel/mqdev-buildah.sh +++ b/mq-advanced-server-rhel/mqdev-buildah.sh @@ -15,9 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Build a RHEL image, using the buildah tool -# Usage -# mq-buildah.sh ARCHIVEFILE PACKAGES +# Build a RHEL image of MQ Advanced for Developers, using the buildah tool set -x set -e @@ -57,12 +55,11 @@ readonly tag=$2 readonly version=$3 -useradd --root $mnt_mq --gid mqm admin -groupadd --root $mnt_mq --system mqclient -useradd --root $mnt_mq --gid mqclient app - -buildah run $ctr_mq -- id admin -buildah run $ctr_mq -- sh -c "echo admin:passw0rd | chpasswd" +# Run these commands inside the container so that the SELinux context is handled correctly +buildah run --user root $ctr_mq -- useradd --gid mqm admin +buildah run --user root $ctr_mq -- groupadd --system mqclient +buildah run --user root $ctr_mq -- useradd --gid mqclient app +buildah run --user root $ctr_mq -- bash -c "echo admin:passw0rd | chpasswd" mkdir -p $mnt_mq/run/runmqdevserver chown 888:888 $mnt_mq/run/runmqdevserver From d9c70c48c53ee2dbb580e6e4ff10d58ffb24da6d Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Wed, 6 Feb 2019 14:23:25 +0000 Subject: [PATCH 5/7] Fix subscription checking logic --- mq-advanced-server-rhel/mq-buildah.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index a1c0176..8ca540e 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -63,11 +63,10 @@ readonly mqm_gid=888 microdnf_opts="--nodocs" # Check whether the host is registered with Red Hat -subscription-manager status -if [ "$?" -eq "0" ]; then +if subscription-manager status ; then # Host is subscribed, but the minimal image has no enabled repos - microdnf_opts="${microdnf_opts} --enablerepo=rhel-7-server-rpms" - # buildah run ${ctr_mq} -- microdnf microdnf --enablerepo=rhel-7-server-rpms --nodocs install ${prereq_packages} + # Note that the "bc" package is the only one in "extras" + microdnf_opts="${microdnf_opts} --enablerepo=rhel-7-server-rpms --enablerepo=rhel-7-server-extras-rpms" else # Use the Yum repositories configured on the host cp -R /etc/yum.repos.d/* ${mnt_mq}/etc/yum.repos.d/ From 77319629fef2a5cd8e51870e3ca233dfd38f2c0f Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Wed, 6 Feb 2019 16:11:52 +0000 Subject: [PATCH 6/7] Update copyright dates --- mq-advanced-server-rhel/install-mq-rhel.sh | 2 +- mq-advanced-server-rhel/mqdev-buildah.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mq-advanced-server-rhel/install-mq-rhel.sh b/mq-advanced-server-rhel/install-mq-rhel.sh index 9396bbe..a0e795b 100755 --- a/mq-advanced-server-rhel/install-mq-rhel.sh +++ b/mq-advanced-server-rhel/install-mq-rhel.sh @@ -1,6 +1,6 @@ #!/bin/bash # -*- mode: sh -*- -# © Copyright IBM Corporation 2018 +# © Copyright IBM Corporation 2018, 2019 # # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/mq-advanced-server-rhel/mqdev-buildah.sh b/mq-advanced-server-rhel/mqdev-buildah.sh index 5c92847..8103098 100755 --- a/mq-advanced-server-rhel/mqdev-buildah.sh +++ b/mq-advanced-server-rhel/mqdev-buildah.sh @@ -1,6 +1,6 @@ #!/bin/bash # -*- mode: sh -*- -# © Copyright IBM Corporation 2018 +# © Copyright IBM Corporation 2018, 2019 # # # Licensed under the Apache License, Version 2.0 (the "License"); From 33f82d76ff776a1cbfa8fb6ab46bcaebd7cf6334 Mon Sep 17 00:00:00 2001 From: Arthur Barr Date: Wed, 6 Feb 2019 16:12:18 +0000 Subject: [PATCH 7/7] Use variable for uid and gid --- mq-advanced-server-rhel/mq-buildah.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mq-advanced-server-rhel/mq-buildah.sh b/mq-advanced-server-rhel/mq-buildah.sh index 8ca540e..78b9d3b 100755 --- a/mq-advanced-server-rhel/mq-buildah.sh +++ b/mq-advanced-server-rhel/mq-buildah.sh @@ -102,7 +102,7 @@ buildah run --user root $ctr_mq -- usermod -aG mqm root # Create the directory for MQ configuration files mkdir -p ${mnt_mq}/etc/mqm -chown 888:888 ${mnt_mq}/etc/mqm +chown ${mqm_uid}:${mqm_gid} ${mnt_mq}/etc/mqm # Install the Go binaries into the image install --mode 0750 --owner ${mqm_uid} --group 0 ./build/runmqserver ${mnt_mq}/usr/local/bin/