diff --git a/.gitignore b/.gitignore
index 8ca3f5a..da814fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ vendor/github.com/prometheus/client_model/bin/
vendor/github.com/prometheus/client_model/.classpath
vendor/github.com/prometheus/client_model/.project
vendor/github.com/prometheus/client_model/.settings*
+gosec_results.json
diff --git a/.travis.yml b/.travis.yml
index a13091c..5d41df9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+dist: xenial
+
sudo: required
language: go
@@ -27,43 +29,51 @@ cache:
directories:
- downloads
-env:
- - BASE_IMAGE=ubuntu:16.04
-# Commented out temporarily until Issue 166 is resolved
-# - BASE_IMAGE=centos:latest
-
jobs:
include:
- - if: type IN (pull_request)
- env: DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test &&
- sudo apt-get autoremove -y docker-ce &&
- curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - &&
- sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &&
- sudo apt-get update &&
- sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) &&
- docker load -q -i images.tar &&
- export DOCKER_API_VERSION=\"1.24\""
- - env: DOCKER_DOWNGRADE="echo nothing to be done"
+ - stage: build and test
+ env:
+ - BASE_IMAGE=ubuntu:16.04
+ - DOCKER_DOWNGRADE="echo nothing to be done"
+ - env:
+ - BASE_IMAGE=centos:7
+ - DOCKER_DOWNGRADE="echo nothing to be done"
+ - if: type IN (pull_request) OR tag IS present
+ env:
+ - BASE_IMAGE=ubuntu:16.04
+ - DOCKER_DOWNGRADE="docker save -o images.tar mqadvanced-server-dev mq-dev-jms-test &&
+ sudo apt-get autoremove -y docker-ce &&
+ curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - &&
+ sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &&
+ sudo apt-get update &&
+ sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs) &&
+ docker load -q -i images.tar &&
+ export DOCKER_API_VERSION=\"1.24\""
before_install:
- - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- - sudo apt-get update
- - sudo apt-get -y install docker-ce
- - curl https://glide.sh/get | sh
- - sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64
- - sudo chmod +x /usr/local/bin/dep
+ - ./install-build-deps-ubuntu.sh
install:
- echo nothing
-script:
+before_script:
+ - echo 'Downloading Go dependencies...' && echo -en 'travis_fold:start:deps\\r'
- make deps
+ - echo -en 'travis_fold:end:deps\\r'
+ - echo 'Building Developer image...' && echo -en 'travis_fold:start:build-devserver\\r'
- make build-devserver
+ - echo -en 'travis_fold:end:build-devserver\\r'
+ - echo 'Building Developer JMS test image...' && echo -en 'travis_fold:start:build-devjmstest\\r'
- make build-devjmstest
+ - echo -en 'travis_fold:end:build-devjmstest\\r'
+
+script:
+ - echo 'Downgrading Docker (if necessary)...' && echo -en 'travis_fold:start:docker-downgrade\\r'
- eval "$DOCKER_DOWNGRADE"
+ - echo -en 'travis_fold:end:docker-downgrade\\r'
+ - echo 'Testing Developer image...' && echo -en 'travis_fold:start:test-devserver\\r'
- make test-devserver
+ - echo -en 'travis_fold:end:test-devserver\\r'
after_success:
- - go get golang.org/x/lint/golint
- make lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d51d44..f469689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,30 @@
# Change log
+## vNext
+
+* Now runs using the "mqm" user instead of root. See new [security doc](https://github.com/ibm-messaging/mq-container/blob/master/docs/security.md)
+* New [IGNSTATE](https://www.ibm.com/support/knowledgecenter/en/SSFKSJ_9.1.0/com.ibm.mq.pro.doc/q132310_.htm#q132310___ignstateparm) parameter used in default developer config
+* Termination log moved from `/dev/termination-log` to `/run/termination-log`, to make permissions easier to handle
+* Fixes for the following issues:
+ * Brackets no longer appear in termination log
+ * Test timeouts weren't being used correctly
+
+## 9.1.1.0 (2018-11-30)
+
+* Updated to MQ version 9.1.1.0
+* Created seperate RedHat Makefile for building images on RedHat machines with buildah
+* Enabled REST messaging capability for app user.
+* Added support for container supplementary groups
+* Removed IBM MQ version 9.0.5 details.
+* Added additional Diagnostics ([#203](https://github.com/ibm-messaging/mq-container/pull/203))
+* Implementted GOSec to perform code scans for security vulnerabilities. (([#227](https://github.com/ibm-messaging/mq-container/pull/227)))
+* Removed Queue manager create option from the MQ Console.
+* Fixes for the following issues:
+ * Check explicitly for `/mnt/mqm` ([#175](https://github.com/ibm-messaging/mq-container/pull/175))
+ * Force string output in chkmqhealthy ([#174](https://github.com/ibm-messaging/mq-container/pull/174))
+ * Use -aG not -G when adding a group for a user
+ * Security fixes for libsystemd0 systemd systemd-sysv & libudev1
+
## 9.1.0.0 (2018-07-23)
* Updated to MQ version 9.1.0.0
diff --git a/Dockerfile-server b/Dockerfile-server
index c1c9970..7086cce 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2015, 2018
+# © Copyright IBM Corporation 2015, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
# limitations under the License.
ARG BASE_IMAGE=ubuntu:16.04
-ARG BUILDER_IMAGE=mq-golang-sdk:9.0.5.0-x86_64-ubuntu-16.04
+ARG BUILDER_IMAGE=mq-golang-sdk:9.1.1.0-x86_64-ubuntu-16.04
###############################################################################
# Build stage to build Go code
@@ -22,10 +22,11 @@ FROM $BUILDER_IMAGE as builder
WORKDIR /go/src/github.com/ibm-messaging/mq-container/
ARG IMAGE_REVISION="Not specified"
ARG IMAGE_SOURCE="Not specified"
+ARG IMAGE_TAG="Not specified"
COPY cmd/ ./cmd
COPY internal/ ./internal
COPY vendor/ ./vendor
-RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\"" ./cmd/runmqserver/
+RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" ./cmd/runmqserver/
RUN go build ./cmd/chkmqready/
RUN go build ./cmd/chkmqhealthy/
# Run all unit tests
@@ -47,12 +48,15 @@ ARG MQ_URL
# The MQ packages to install - see install-mq.sh for default value
ARG MQ_PACKAGES
+# The UID to use for the "mqm" user
+ARG MQM_UID=999
+
COPY install-mq.sh /usr/local/bin/
# Install MQ. To avoid a "text file busy" error here, we sleep before installing.
RUN chmod u+x /usr/local/bin/install-mq.sh \
&& sleep 1 \
- && install-mq.sh
+ && install-mq.sh $MQM_UID
# Create a directory for runtime data from runmqserver
RUN mkdir -p /run/runmqserver \
@@ -64,7 +68,12 @@ COPY NOTICES.txt /opt/mqm/licenses/notices-container.txt
RUN chmod ug+x /usr/local/bin/runmqserver \
&& chown mqm:mqm /usr/local/bin/*mq* \
- && chmod ug+xs /usr/local/bin/chkmq*
+ && chmod ug+xs /usr/local/bin/chkmq* \
+ && install --directory --mode 0775 --owner mqm --group root /run/runmqserver \
+ && install --directory --mode 0775 --owner mqm --group root /run/tls \
+ && touch /run/termination-log \
+ && chown mqm:root /run/termination-log \
+ && chmod 0660 /run/termination-log
# Always use port 1414 for MQ, 9157 for the metrics & 9443 for the web console
EXPOSE 1414 9157 9443
@@ -74,4 +83,6 @@ COPY web /etc/mqm/web
ENV LANG=en_US.UTF-8 AMQ_DIAGNOSTIC_MSG_SEVERITY=1 AMQ_ADDITIONAL_JSON_LOG=1 LOG_FORMAT=basic
+USER $MQM_UID
+
ENTRYPOINT ["runmqserver"]
diff --git a/LICENSE b/LICENSE
index f2249fd..94482e6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,7 +176,7 @@
END OF TERMS AND CONDITIONS
- © Copyright IBM Corporation. 2015, 2018
+ © Copyright IBM Corporation. 2015, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
index cd0e45f..7aeb76a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,66 +17,54 @@
###############################################################################
GO_PKG_DIRS = ./cmd ./internal ./test
-BASE_OS = $(shell cat /etc/*-release | grep ID=)
-ifeq "$(findstring ubuntu,$(BASE_OS))" "ubuntu"
- BASE_OS=UBUNTU
-else ifeq "$(findstring rhel,$(BASE_OS))" "rhel"
- BASE_OS=RHEL
-else
- BASE_OS=UNKNOWN
+# Set variable if running on a Red Hat Enterprise Linux host
+ifneq ($(wildcard /etc/redhat-release),)
+REDHAT_RELEASE = $(shell cat /etc/redhat-release)
+ifeq "$(findstring Red Hat,$(REDHAT_RELEASE))" "Red Hat"
+ RHEL_HOST = "true"
+endif
endif
-
-
###############################################################################
# Build targets
###############################################################################
-# default to building UBUNTU as this was the default for the previous Makefile
+# Targets default to a RHEL image on a RHEL host, or an Ubuntu image everywhere else
+
.PHONY: build-devserver
-ifeq ($(BASE_OS),UBUNTU)
-build-devserver: build-devserver-ubuntu
-else ifeq ($(BASE_OS),RHEL)
+ifdef RHEL_HOST
build-devserver: build-devserver-rhel
else
-build-devserver: unknownos
+build-devserver: build-devserver-ubuntu
endif
.PHONY: build-advancedserver
-ifeq ($(BASE_OS),UBUNTU)
-build-advancedserver: build-advancedserver-ubuntu
-else ifeq ($(BASE_OS),RHEL)
+ifdef RHEL_HOST
build-advancedserver: build-advancedserver-rhel
else
-build-advancedserver: unknownos
+build-advancedserver: build-advancedserver-ubuntu
endif
.PHONY: test-devserver
-ifeq ($(BASE_OS),UBUNTU)
-test-devserver: test-devserver-ubuntu
-else ifeq ($(BASE_OS),RHEL)
+ifdef RHEL_HOST
test-devserver: test-devserver-rhel
else
-test-devserver: unknownos
+test-devserver: test-devserver-ubuntu
endif
.PHONY: test-advancedserver
-ifeq ($(BASE_OS),UBUNTU)
-test-advancedserver: test-advancedserver-ubuntu
-else ifeq ($(BASE_OS),RHEL)
+ifdef RHEL_HOST
test-advancedserver: test-advancedserver-rhel
else
-test-advancedserver: unknownos
+test-advancedserver: test-advancedserver-ubuntu
endif
.PHONY: build-devjmstest
-ifeq ($(BASE_OS),UBUNTU)
-build-devjmstest: build-devjmstest-ubuntu
-else ifeq ($(BASE_OS),RHEL)
+ifdef RHEL_HOST
build-devjmstest: build-devjmstest-rhel
else
-build-devjmstest: unknownos
+build-devjmstest: build-devjmstest-ubuntu
endif
# UBUNTU building targets
@@ -153,6 +141,32 @@ lint: $(addsuffix /$(wildcard *.go), $(GO_PKG_DIRS))
@# As of 11/04/2018 there is an open issue to fix it: https://github.com/golang/lint/issues/320
golint -set_exit_status $(sort $(dir $(wildcard $(addsuffix /*/*.go, $(GO_PKG_DIRS)))))
+.PHONY: gosec
+gosec: $(info $(SPACER)$(shell printf "Running gosec test"$(END)))
+ @gosec -fmt=json -out=gosec_results.json cmd/... internal/... 2> /dev/null ;\
+ cat "gosec_results.json" ;\
+ cat gosec_results.json | grep HIGH | grep severity > /dev/null ;\
+ if [ $$? -eq 0 ]; then \
+ printf "\nFAILURE: gosec found files containing HIGH severity issues - see results.json\n" ;\
+ exit 1 ;\
+ else \
+ printf "\ngosec found no HIGH severity issues\n" ;\
+ fi ;\
+ cat gosec_results.json | grep MEDIUM | grep severity > /dev/null ;\
+ if [ $$? -eq 0 ]; then \
+ printf "\nFAILURE: gosec found files containing MEDIUM severity issues - see results.json\n" ;\
+ exit 1 ;\
+ else \
+ printf "\ngosec found no MEDIUM severity issues\n" ;\
+ fi ;\
+ cat gosec_results.json | grep LOW | grep severity > /dev/null;\
+ if [ $$? -eq 0 ]; then \
+ printf "\nFAILURE: gosec found files containing LOW severity issues - see results.json\n" ;\
+ exit 1;\
+ else \
+ printf "\ngosec found no LOW severity issues\n" ;\
+fi ;\
+
.PHONY: unknownos
unknownos:
$(info $(SPACER)$(shell printf "ERROR: Unknown OS ("$(BASE_OS)") please run specific make targets"$(END)))
diff --git a/Makefile-RHEL b/Makefile-RHEL
index 7ddd69e..3f22004 100644
--- a/Makefile-RHEL
+++ b/Makefile-RHEL
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,16 +19,16 @@
# BASE_IMAGE is the base image to use for MQ, for example "ubuntu" or "rhel"
BASE_IMAGE ?= rhel
# MQ_VERSION is the fully qualified MQ version number to build
-MQ_VERSION ?= 9.1.0.0
+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))
-# 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))
+# MQ_SDK_ARCHIVE specifies the archive to use for the MQ redistributable client, which is used for building the golang programs.
+MQ_SDK_ARCHIVE ?= 9.1.1.0-IBM-MQC-Redist-LinuxX64.tar.gz
# Options to `go test` for the Docker tests
TEST_OPTS_DOCKER ?=
# MQ_IMAGE_ADVANCEDSERVER is the name and tag of the built MQ Advanced image
@@ -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)))
@@ -78,22 +82,52 @@ endif
# Archive names for IBM MQ Advanced for Developers
MQ_ARCHIVE_DEV_9.0.5.0=mqadv_dev905_linux_x86-64.tar.gz
MQ_ARCHIVE_DEV_9.1.0.0=mqadv_dev910_linux_$(MQ_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV_9.1.1.0=mqadv_dev911_linux_$(MQ_DEV_ARCH).tar.gz
###############################################################################
# Build targets
###############################################################################
+.PHONY: vars
+vars:
+#ifeq "$(findstring ubuntu,$(BASE_IMAGE))","ubuntu"
+ @echo $(MQ_ARCHIVE_ARCH)
+ @echo $(MQ_ARCHIVE_TYPE)
+ @echo $(MQ_ARCHIVE)
-# Vendor Go dependencies for the Docker tests
-test/docker/vendor:
- cd test/docker && dep ensure -vendor-only
+.PHONY: default
+default: build-devserver test-devserver
+
+# Build all components (except incubating ones)
+.PHONY: all
+all: build-devserver build-advancedserver
+
+.PHONY: test-all
+test-all: build-devjmstest test-devserver test-advancedserver
+
+.PHONY: devserver
+devserver: build-devserver build-devjmstest test-devserver
+
+# Build incubating components
+.PHONY: incubating
+incubating: build-explorer
downloads/$(MQ_ARCHIVE_DEV):
$(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced for Developers "$(MQ_VERSION)$(END)))
mkdir -p downloads
cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/$(MQ_ARCHIVE_DEV)
+downloads/$(MQ_SDK_ARCHIVE):
+ $(info $(SPACER)$(shell printf $(TITLE)"Downloading IBM MQ Advanced redistributable client "$(MQ_VERSION)$(END)))
+ mkdir -p downloads
+ cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist/$(MQ_SDK_ARCHIVE)
+
.PHONY: downloads
-downloads: downloads/$(MQ_ARCHIVE_DEV)
+downloads: downloads/$(MQ_ARCHIVE_DEV) downloads/$(MQ_SDK_ARCHIVE)
+
+# Vendor Go dependencies for the Docker tests
+test/docker/vendor:
+ cd test/docker && dep ensure -vendor-only
+
.PHONY: check-prereqs
check-prereqs:
@@ -103,7 +137,7 @@ check-prereqs:
yum list | grep yum-utils || (echo "Missing required package yum-utils" && exit 1)
.PHONY: check-test-prereqs
-check-prereqs:
+check-test-prereqs:
$(info $(SPACER)$(shell printf $(TITLE)"Checking for prereqs"$(END)))
which buildah || (echo "Missing required program buildah" && exit 1)
which docker || (echo "Missing required program docker" && exit 1)
@@ -111,7 +145,7 @@ check-prereqs:
.PHONY: test-advancedserver
test-advancedserver: check-test-prereqs test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on $(shell docker --version)"$(END)))
- buildah push $(MQ_IMAGE_ADVANCEDSERVER) docker-daemon:$(MQ_IMAGE_ADVANCEDSERVER)
+ sudo buildah push $(MQ_IMAGE_ADVANCEDSERVER) docker-daemon:$(MQ_IMAGE_ADVANCEDSERVER)
docker tag docker.io/$(MQ_IMAGE_ADVANCEDSERVER) $(MQ_IMAGE_ADVANCEDSERVER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) EXPECTED_LICENSE=Production go test $(TEST_OPTS_DOCKER)
@@ -119,43 +153,51 @@ test-advancedserver: check-test-prereqs test/docker/vendor
.PHONY: test-devserver
test-devserver: check-test-prereqs test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END)))
- buildah push $(MQ_IMAGE_DEVSERVER) docker-daemon:$(MQ_IMAGE_DEVSERVER)
+ sudo buildah push $(MQ_IMAGE_DEVSERVER) docker-daemon:$(MQ_IMAGE_DEVSERVER)
docker tag docker.io/$(MQ_IMAGE_DEVSERVER) $(MQ_IMAGE_DEVSERVER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) go test -tags mqdev $(TEST_OPTS_DOCKER)
.PHONY: build-advancedserver
-build-advancedserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE)
build-advancedserver: check-prereqs downloads/$(MQ_ARCHIVE) build-go-programs
$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_ADVANCEDSERVER)"$(END)))
- mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_ADVANCEDSERVER)" "$(MQ_VERSION)" "$(MQDEV)"
+ sudo mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_ADVANCEDSERVER)" "$(MQ_VERSION)" "$(MQDEV)"
.PHONY: build-devserver
-build-devserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE_DEV)
build-devserver: MQDEV=TRUE
build-devserver: check-prereqs downloads/$(MQ_ARCHIVE_DEV) build-go-programs
$(info $(SPACER)$(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER)"$(END)))
- mq-advanced-server-rhel/mq-buildah.sh "$(MQ_ARCHIVE_DEV)" "$(MQ_PACKAGES)" "$(MQ_IMAGE_DEVSERVER_BASE)" "$(MQ_VERSION)" "$(MQDEV)"
- mq-advanced-server-rhel/mqdev-buildah.sh "$(MQ_IMAGE_DEVSERVER_BASE)" "$(MQ_IMAGE_DEVSERVER)" "$(MQ_VERSION)"
+ 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)
$(info $(SPACER)$(shell printf $(TITLE)"Build mq-golang SDK"$(END)))
- mq-advanced-server-rhel/mq-golang-sdk-buildah.sh "$(MQ_SDK_ARCHIVE)" "$(MQ_IMAGE_GOLANG_SDK)"
-
+ 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 build-mqgolang-sdk
+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) mq-advanced-server-rhel/go-buildah.sh "$(MQ_IMAGE_GOLANG_SDK)" "$(MQDEV)"
+ IMAGE_REVISION=$(IMAGE_REVISION) IMAGE_SOURCE=$(IMAGE_SOURCE) sudo --preserve-env mq-advanced-server-rhel/go-buildah.sh "$(MQ_IMAGE_GOLANG_SDK)" "$(MQDEV)"
.PHONY: build-devjmstest
build-devjmstest: check-test-prereqs
$(info $(SPACER)$(shell printf $(TITLE)"Build JMS tests for developer config"$(END)))
- cd test/messaging && ./buildah.sh $(DEV_JMS_IMAGE)
- buildah push $(DEV_JMS_IMAGE) docker-daemon:$(DEV_JMS_IMAGE)
+ cd test/messaging && sudo ./buildah.sh $(DEV_JMS_IMAGE)
+ 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 5a6e87d..82b6898 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.
@@ -19,11 +19,11 @@
# BASE_IMAGE is the base image to use for MQ, for example "ubuntu" or "rhel"
BASE_IMAGE ?= ubuntu:16.04
# MQ_VERSION is the fully qualified MQ version number to build
-MQ_VERSION ?= 9.1.0.0
+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/))
@@ -73,9 +77,11 @@ endif
ifeq "$(findstring ubuntu,$(BASE_IMAGE))" "ubuntu"
MQ_ARCHIVE_TYPE=UBUNTU
MQ_ARCHIVE_DEV_PLATFORM=ubuntu
+ MQM_UID=999
else
MQ_ARCHIVE_TYPE=LINUX
MQ_ARCHIVE_DEV_PLATFORM=linux
+ MQM_UID=888
endif
# Try to figure out which archive to use from the architecture
ifeq "$(ARCH)" "x86_64"
@@ -91,6 +97,7 @@ endif
# Archive names for IBM MQ Advanced for Developers
MQ_ARCHIVE_DEV_9.0.5.0=mqadv_dev905_$(MQ_ARCHIVE_DEV_PLATFORM)_x86-64.tar.gz
MQ_ARCHIVE_DEV_9.1.0.0=mqadv_dev910_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
+MQ_ARCHIVE_DEV_9.1.1.0=mqadv_dev911_$(MQ_ARCHIVE_DEV_PLATFORM)_$(MQ_DEV_ARCH).tar.gz
###############################################################################
# Build targets
@@ -144,6 +151,7 @@ test-unit:
.PHONY: test-advancedserver
test-advancedserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_ADVANCEDSERVER) on $(shell docker --version)"$(END)))
+ docker inspect $(MQ_IMAGE_ADVANCEDSERVER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) EXPECTED_LICENSE=Production go test -parallel $(NUM_CPU) $(TEST_OPTS_DOCKER)
.PHONY: build-devjmstest
@@ -154,6 +162,7 @@ build-devjmstest:
.PHONY: test-devserver
test-devserver: test/docker/vendor
$(info $(SPACER)$(shell printf $(TITLE)"Test $(MQ_IMAGE_DEVSERVER) on $(shell docker --version)"$(END)))
+ docker inspect $(MQ_IMAGE_DEVSERVER)
cd test/docker && TEST_IMAGE=$(MQ_IMAGE_DEVSERVER) EXPECTED_LICENSE=Developer DEV_JMS_IMAGE=$(DEV_JMS_IMAGE) IBMJRE=true go test -parallel $(NUM_CPU) -tags mqdev $(TEST_OPTS_DOCKER)
coverage:
@@ -204,6 +213,8 @@ define docker-build-mq
--build-arg BUILDER_IMAGE=$(MQ_IMAGE_GOLANG_SDK) \
--build-arg IMAGE_REVISION="$(IMAGE_REVISION)" \
--build-arg IMAGE_SOURCE="$(IMAGE_SOURCE)" \
+ --build-arg IMAGE_TAG="$1" \
+ --build-arg MQM_UID=$(MQM_UID) \
--label IBM_PRODUCT_ID=$4 \
--label IBM_PRODUCT_NAME=$5 \
--label IBM_PRODUCT_VERSION=$6 \
@@ -229,15 +240,20 @@ build-devserver: MQ_SDK_ARCHIVE=$(MQ_ARCHIVE_DEV)
build-devserver: downloads/$(MQ_ARCHIVE_DEV) docker-version build-golang-sdk-ex
$(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_DEVSERVER_BASE)"$(END)))
$(call docker-build-mq,$(MQ_IMAGE_DEVSERVER_BASE),Dockerfile-server,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
- $(DOCKER) build --tag $(MQ_IMAGE_DEVSERVER) --build-arg IMAGE_SOURCE="$(IMAGE_SOURCE)" --build-arg IMAGE_REVISION="$(IMAGE_REVISION)" --build-arg BASE_IMAGE=$(MQ_IMAGE_DEVSERVER_BASE) --build-arg BUILDER_IMAGE=$(MQ_IMAGE_GOLANG_SDK) --file incubating/mqadvanced-server-dev/Dockerfile .
+ $(DOCKER) build --tag $(MQ_IMAGE_DEVSERVER) --build-arg IMAGE_SOURCE="$(IMAGE_SOURCE)" --build-arg IMAGE_REVISION="$(IMAGE_REVISION)" --build-arg IMAGE_TAG="$(MQ_IMAGE_DEVSERVER)" --build-arg BASE_IMAGE=$(MQ_IMAGE_DEVSERVER_BASE) --build-arg BUILDER_IMAGE=$(MQ_IMAGE_GOLANG_SDK) --build-arg MQM_UID=$(MQM_UID) --file incubating/mqadvanced-server-dev/Dockerfile .
.PHONY: build-advancedserver-cover
build-advancedserver-cover: docker-version
$(DOCKER) build --build-arg BASE_IMAGE=$(MQ_IMAGE_ADVANCEDSERVER) -t $(MQ_IMAGE_ADVANCEDSERVER)-cover -f Dockerfile-server.cover .
-.PHONY: build-explorer
+.PHONY: build-explorer
+ifeq "$(findstring ubuntu,$(BASE_IMAGE))" "ubuntu"
+build-explorer: MQ_PACKAGES=ibmmq-explorer
+else
+build-explorer: MQ_PACKAGES=MQSeriesRuntime*.rpm MQSeriesJRE*.rpm MQSeriesExplorer*.rpm
+endif
build-explorer: downloads/$(MQ_ARCHIVE_DEV) docker-pull
- $(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
+ $(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
.PHONY: build-sdk
build-sdk: downloads/$(MQ_SDK_ARCHIVE) build-sdk-ex
@@ -249,6 +265,7 @@ else
build-sdk-ex: MQ_PACKAGES=MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm
endif
build-sdk-ex: docker-version docker-pull
+ $(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_SDK)"$(END)))
$(call docker-build-mq,$(MQ_IMAGE_SDK),incubating/mq-sdk/Dockerfile,$(MQ_SDK_ARCHIVE),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers SDK (Non-Warranted)",$(MQ_VERSION))
.PHONY: build-golang-sdk
@@ -256,8 +273,8 @@ build-golang-sdk: downloads/$(MQ_SDK_ARCHIVE) build-golang-sdk-ex
.PHONY: build-golang-sdk-ex
build-golang-sdk-ex: docker-version build-sdk-ex
+ $(info $(shell printf $(TITLE)"Build $(MQ_IMAGE_GOLANG_SDK)"$(END)))
$(DOCKER) build --build-arg BASE_IMAGE=$(MQ_IMAGE_SDK) -t $(MQ_IMAGE_GOLANG_SDK) -f incubating/mq-golang-sdk/Dockerfile .
-# $(call docker-build-mq,$(MQ_IMAGE_GOLANG_SDK),incubating/mq-golang-sdk/Dockerfile,$(MQ_IMAGE_SDK),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers SDK (Non-Warranted)",$(MQ_VERSION))
.PHONY: docker-pull
docker-pull:
diff --git a/README.md b/README.md
index 2666037..b53d97a 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ The Dockerfiles and associated code and scripts are licensed under the [Apache L
Licenses for the products installed within the images are as follows:
- [IBM MQ Advanced for Developers](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-AVCJ4S) (International License Agreement for Non-Warranted Programs). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
-- [IBM MQ Advanced](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-AV6GV5) (International Program License Agreement). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
+- [IBM MQ Advanced](http://www14.software.ibm.com/cgi-bin/weblap/lap.pl?la_formnum=Z125-3301-14&li_formnum=L-APIG-AZYF4X) (International Program License Agreement). This license may be viewed from an image using the `LICENSE=view` environment variable as described above or by following the link above.
- License information for Ubuntu packages may be found in `/usr/share/doc/${package}/copyright`
Note: The IBM MQ Advanced for Developers license does not permit further distribution and the terms restrict usage to a developer machine.
diff --git a/cmd/chkmqhealthy/main.go b/cmd/chkmqhealthy/main.go
index b26bea8..02dbbfa 100644
--- a/cmd/chkmqhealthy/main.go
+++ b/cmd/chkmqhealthy/main.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2017
+© 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.
@@ -32,6 +32,7 @@ func queueManagerHealthy() (bool, error) {
return false, err
}
// Specify the queue manager name, just in case someone's created a second queue manager
+ // #nosec G204
cmd := exec.Command("dspmq", "-n", "-m", name)
// Run the command and wait for completion
out, err := cmd.CombinedOutput()
diff --git a/cmd/chkmqready/main.go b/cmd/chkmqready/main.go
index 4bb0c66..e75f1c5 100644
--- a/cmd/chkmqready/main.go
+++ b/cmd/chkmqready/main.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -37,5 +37,8 @@ func main() {
fmt.Println(err)
os.Exit(1)
}
- conn.Close()
+ err = conn.Close()
+ if err != nil {
+ fmt.Println(err)
+ }
}
diff --git a/cmd/runmqdevserver/logruntime.go b/cmd/runmqdevserver/logruntime.go
new file mode 100644
index 0000000..efa9694
--- /dev/null
+++ b/cmd/runmqdevserver/logruntime.go
@@ -0,0 +1,68 @@
+/*
+© 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.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package main
+
+import (
+ "runtime"
+ "strings"
+
+ containerruntime "github.com/ibm-messaging/mq-container/internal/containerruntime"
+ "github.com/ibm-messaging/mq-container/internal/user"
+)
+
+func logContainerDetails() {
+ log.Printf("CPU architecture: %v", runtime.GOARCH)
+ kv, err := containerruntime.GetKernelVersion()
+ if err == nil {
+ log.Printf("Linux kernel version: %v", kv)
+ }
+ cr, err := containerruntime.GetContainerRuntime()
+ if err == nil {
+ log.Printf("Container runtime: %v", cr)
+ }
+ bi, err := containerruntime.GetBaseImage()
+ if err == nil {
+ log.Printf("Base image: %v", bi)
+ }
+ u, err := user.GetUser()
+ if err == nil {
+ if len(u.SupplementalGID) == 0 {
+ log.Printf("Running as user ID %v (%v) with primary group %v", u.UID, u.Name, u.PrimaryGID)
+ } else {
+ log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.UID, u.Name, u.PrimaryGID, strings.Join(u.SupplementalGID, ","))
+ }
+ }
+ caps, err := containerruntime.GetCapabilities()
+ capLogged := false
+ if err == nil {
+ for k, v := range caps {
+ if len(v) > 0 {
+ log.Printf("Capabilities (%s set): %v", strings.ToLower(k), strings.Join(v, ","))
+ capLogged = true
+ }
+ }
+ if !capLogged {
+ log.Print("Capabilities: none")
+ }
+ } else {
+ log.Errorf("Error getting capabilities: %v", err)
+ }
+ sc, err := containerruntime.GetSeccomp()
+ if err == nil {
+ log.Printf("seccomp enforcing mode: %v", sc)
+ }
+ log.Printf("Process security attributes: %v", containerruntime.GetSecurityAttributes())
+}
diff --git a/cmd/runmqdevserver/main.go b/cmd/runmqdevserver/main.go
index f1d8cd9..b6c4247 100644
--- a/cmd/runmqdevserver/main.go
+++ b/cmd/runmqdevserver/main.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -31,16 +31,21 @@ import (
var log *logger.Logger
func setPassword(user string, password string) error {
- cmd := exec.Command("chpasswd")
+ // #nosec G204
+ cmd := exec.Command("sudo", "chpasswd")
stdin, err := cmd.StdinPipe()
if err != nil {
return err
}
fmt.Fprintf(stdin, "%s:%s", user, password)
- stdin.Close()
- _, _, err = command.RunCmd(cmd)
+ err = stdin.Close()
if err != nil {
- return err
+ log.Errorf("Error closing password stdin: %v", err)
+ }
+ out, _, err := command.RunCmd(cmd)
+ if err != nil {
+ // Include the command output in the error
+ return fmt.Errorf("%v: %v", err.Error(), out)
}
log.Printf("Set password for \"%v\" user", user)
return nil
@@ -90,16 +95,16 @@ func configureWeb(qmName string) error {
}
func logTerminationf(format string, args ...interface{}) {
- logTermination(fmt.Sprintf(format, args))
+ logTermination(fmt.Sprintf(format, args...))
}
// TODO: Duplicated code
func logTermination(args ...interface{}) {
- msg := fmt.Sprint(args)
- // Write the message to the termination log. This is the default place
+ msg := fmt.Sprint(args...)
+ // Write the message to the termination log. This is not the default place
// that Kubernetes will look for termination information.
log.Debugf("Writing termination message: %v", msg)
- err := ioutil.WriteFile("/dev/termination-log", []byte(msg), 0660)
+ err := ioutil.WriteFile("/run/termination-log", []byte(msg), 0660)
if err != nil {
log.Debug(err)
}
@@ -112,6 +117,9 @@ func doMain() error {
logTermination(err)
return err
}
+
+ logContainerDetails()
+
adminPassword, set := os.LookupEnv("MQ_ADMIN_PASSWORD")
if set {
err = setPassword("admin", adminPassword)
@@ -166,6 +174,10 @@ func main() {
osExit(1)
} else {
// Replace this process with runmqserver
- syscall.Exec("/usr/local/bin/runmqserver", []string{"runmqserver"}, os.Environ())
+ // #nosec G204
+ err = syscall.Exec("/usr/local/bin/runmqserver", []string{"runmqserver", "-dev"}, os.Environ())
+ if err != nil {
+ log.Errorf("Error replacing this process with runmqserver: %v", err)
+ }
}
}
diff --git a/cmd/runmqdevserver/mqsc.go b/cmd/runmqdevserver/mqsc.go
index d2d111b..f35512d 100644
--- a/cmd/runmqdevserver/mqsc.go
+++ b/cmd/runmqdevserver/mqsc.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -37,7 +37,14 @@ func updateMQSC(appPasswordRequired bool) error {
return err
}
} else {
- os.Remove(mqsc)
+ _, err := os.Stat(mqsc)
+ if !os.IsNotExist(err) {
+ err = os.Remove(mqsc)
+ if err != nil {
+ log.Errorf("Error removing file %s: %v", mqsc, err)
+ return err
+ }
+ }
}
return nil
}
diff --git a/cmd/runmqdevserver/tls.go b/cmd/runmqdevserver/tls.go
index 55681f5..974a319 100644
--- a/cmd/runmqdevserver/tls.go
+++ b/cmd/runmqdevserver/tls.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -58,24 +58,19 @@ func configureWebTLS(cms *keystore.KeyStore) error {
if err != nil {
return err
}
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(tlsConfig, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
return nil
}
func configureTLS(qmName string, inputFile string, passPhrase string) error {
+ err := createDevTLSDir()
+ if err != nil {
+ return err
+ }
+
log.Debug("Configuring TLS")
- _, err := os.Stat(inputFile)
+ _, err = os.Stat(inputFile)
if err != nil {
return err
}
@@ -84,28 +79,6 @@ func configureTLS(qmName string, inputFile string, passPhrase string) error {
dir := "/run/runmqdevserver/tls"
keyFile := filepath.Join(dir, "key.kdb")
- _, err = os.Stat(dir)
- if err != nil {
- if os.IsNotExist(err) {
- err = os.MkdirAll(dir, 0770)
- if err != nil {
- return err
- }
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(dir, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
- } else {
- return err
- }
- }
-
cms := keystore.NewCMSKeyStore(keyFile, passPhrase)
err = cms.Create(log)
@@ -163,3 +136,32 @@ func configureTLS(qmName string, inputFile string, passPhrase string) error {
return nil
}
+
+func createDevTLSDir() error {
+ // TODO: Use a persisted file (on the volume) instead?
+ dir := "/run/runmqdevserver/tls"
+
+ _, err := os.Stat(dir)
+ if err != nil {
+ if os.IsNotExist(err) {
+ // #nosec G301
+ err = os.MkdirAll(dir, 0770)
+ if err != nil {
+ return err
+ }
+ mqmUID, mqmGID, err := command.LookupMQM()
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ err = os.Chown(dir, mqmUID, mqmGID)
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ } else {
+ return err
+ }
+ }
+ return nil
+}
diff --git a/cmd/runmqserver/crtmqvol.go b/cmd/runmqserver/crtmqvol.go
index 3ff017f..a862d85 100644
--- a/cmd/runmqserver/crtmqvol.go
+++ b/cmd/runmqserver/crtmqvol.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -29,6 +29,7 @@ func createVolume(path string) error {
fi, err := os.Stat(dataPath)
if err != nil {
if os.IsNotExist(err) {
+ // #nosec G301
err = os.MkdirAll(dataPath, 0755)
if err != nil {
return err
@@ -59,3 +60,61 @@ func createVolume(path string) error {
}
return nil
}
+
+func createWebConsoleTLSDirStructure() error {
+ // Create tls directory
+ dir := "/run/tls"
+ _, err := os.Stat(dir)
+ if err != nil {
+ if os.IsNotExist(err) {
+ err = os.MkdirAll(dir, 0770)
+ if err != nil {
+ return err
+ }
+ mqmUID, mqmGID, err := command.LookupMQM()
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ err = os.Chown(dir, mqmUID, mqmGID)
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ } else {
+ return err
+ }
+ }
+
+ return nil
+}
+
+/* TODO: remove duplicated code */
+func createDevTLSDir() error {
+ // TODO: Use a persisted file (on the volume) instead?
+ dir := "/run/runmqdevserver/tls"
+
+ _, err := os.Stat(dir)
+ if err != nil {
+ if os.IsNotExist(err) {
+ // #nosec G301
+ err = os.MkdirAll(dir, 0770)
+ if err != nil {
+ return err
+ }
+ mqmUID, mqmGID, err := command.LookupMQM()
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ err = os.Chown(dir, mqmUID, mqmGID)
+ if err != nil {
+ log.Error(err)
+ return err
+ }
+ } else {
+ return err
+ }
+ }
+ return nil
+}
diff --git a/cmd/runmqserver/license.go b/cmd/runmqserver/license.go
index 309a74b..aad7810 100644
--- a/cmd/runmqserver/license.go
+++ b/cmd/runmqserver/license.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -78,6 +78,7 @@ func checkLicense() (bool, error) {
return true, nil
case ok && lic == "view":
file := filepath.Join("/opt/mqm/licenses", resolveLicenseFile())
+ // #nosec G304
buf, err := ioutil.ReadFile(file)
if err != nil {
log.Println(err)
diff --git a/cmd/runmqserver/logging.go b/cmd/runmqserver/logging.go
index d46ac97..12ec6ca 100644
--- a/cmd/runmqserver/logging.go
+++ b/cmd/runmqserver/logging.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -33,18 +33,18 @@ import (
// var debug = false
var log *logger.Logger
-var collectDiagOnFail bool = false
+var collectDiagOnFail = false
func logTerminationf(format string, args ...interface{}) {
- logTermination(fmt.Sprintf(format, args))
+ logTermination(fmt.Sprintf(format, args...))
}
func logTermination(args ...interface{}) {
- msg := fmt.Sprint(args)
- // Write the message to the termination log. This is the default place
+ msg := fmt.Sprint(args...)
+ // Write the message to the termination log. This is not the default place
// that Kubernetes will look for termination information.
log.Debugf("Writing termination message: %v", msg)
- err := ioutil.WriteFile("/dev/termination-log", []byte(msg), 0660)
+ err := ioutil.WriteFile("/run/termination-log", []byte(msg), 0660)
if err != nil {
log.Debug(err)
}
@@ -108,8 +108,12 @@ func configureLogger(name string) (mirrorFunc, error) {
return func(msg string) {
// Parse the JSON message, and print a simplified version
var obj map[string]interface{}
- json.Unmarshal([]byte(msg), &obj)
- fmt.Printf(formatSimple(obj["ibm_datetime"].(string), obj["message"].(string)))
+ err := json.Unmarshal([]byte(msg), &obj)
+ if err != nil {
+ fmt.Printf("Failed to Unmarshall JSON - %v", err)
+ } else {
+ fmt.Printf(formatSimple(obj["ibm_datetime"].(string), obj["message"].(string)))
+ }
}, nil
default:
log, err = logger.NewLogger(os.Stdout, d, false, name)
@@ -124,20 +128,30 @@ func logDiagnostics() {
log.Debug("--- Start Diagnostics ---")
// show the directory ownership/permissions
+ // #nosec G104
out, _, _ := command.Run("ls", "-l", "/mnt/")
log.Debugf("/mnt/:\n%s", out)
+ // #nosec G104
out, _, _ = command.Run("ls", "-l", "/mnt/mqm")
log.Debugf("/mnt/mqm:\n%s", out)
+ // #nosec G104
out, _, _ = command.Run("ls", "-l", "/mnt/mqm/data")
log.Debugf("/mnt/mqm/data:\n%s", out)
+ // #nosec G104
+ out, _, _ = command.Run("ls", "-l", "/etc/mqm")
+ log.Debugf("/etc/mqm:\n%s", out)
+ // #nosec G104
out, _, _ = command.Run("ls", "-l", "/var/mqm")
log.Debugf("/var/mqm:\n%s", out)
+ // #nosec G104
out, _, _ = command.Run("ls", "-l", "/var/mqm/errors")
log.Debugf("/var/mqm/errors:\n%s", out)
// Print out summary of any FDCs
+ // #nosec G204
cmd := exec.Command("/opt/mqm/bin/ffstsummary")
cmd.Dir = "/var/mqm/errors"
+ // #nosec G104
outB, _ := cmd.CombinedOutput()
log.Debugf("ffstsummary:\n%s", string(outB))
diff --git a/cmd/runmqserver/logruntime.go b/cmd/runmqserver/logruntime.go
new file mode 100644
index 0000000..2f552f0
--- /dev/null
+++ b/cmd/runmqserver/logruntime.go
@@ -0,0 +1,86 @@
+/*
+© 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.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package main
+
+import (
+ "fmt"
+ "runtime"
+ "strings"
+
+ containerruntime "github.com/ibm-messaging/mq-container/internal/containerruntime"
+ "github.com/ibm-messaging/mq-container/internal/user"
+)
+
+func logContainerDetails() error {
+ if runtime.GOOS != "linux" {
+ return fmt.Errorf("Unsupported platform: %v", runtime.GOOS)
+ }
+ log.Printf("CPU architecture: %v", runtime.GOARCH)
+ kv, err := containerruntime.GetKernelVersion()
+ if err == nil {
+ log.Printf("Linux kernel version: %v", kv)
+ }
+ cr, err := containerruntime.GetContainerRuntime()
+ if err == nil {
+ log.Printf("Container runtime: %v", cr)
+ }
+ bi, err := containerruntime.GetBaseImage()
+ if err == nil {
+ log.Printf("Base image: %v", bi)
+ }
+ u, err := user.GetUser()
+ if err == nil {
+ if len(u.SupplementalGID) == 0 {
+ log.Printf("Running as user ID %v (%v) with primary group %v", u.UID, u.Name, u.PrimaryGID)
+ } else {
+ log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.UID, u.Name, u.PrimaryGID, strings.Join(u.SupplementalGID, ","))
+ }
+ }
+ caps, err := containerruntime.GetCapabilities()
+ capLogged := false
+ if err == nil {
+ for k, v := range caps {
+ if len(v) > 0 {
+ log.Printf("Capabilities (%s set): %v", strings.ToLower(k), strings.Join(v, ","))
+ capLogged = true
+ }
+ }
+ if !capLogged {
+ log.Print("Capabilities: none")
+ }
+ } else {
+ log.Errorf("Error getting capabilities: %v", err)
+ }
+ sc, err := containerruntime.GetSeccomp()
+ if err == nil {
+ log.Printf("seccomp enforcing mode: %v", sc)
+ }
+ log.Printf("Process security attributes: %v", containerruntime.GetSecurityAttributes())
+ m, err := containerruntime.GetMounts()
+ if err == nil {
+ if len(m) == 0 {
+ log.Print("No volume detected. Persistent messages may be lost")
+ } else {
+ for mountPoint, fsType := range m {
+ log.Printf("Detected '%v' volume mounted to %v", fsType, mountPoint)
+ if !containerruntime.SupportedFilesystem(fsType) {
+ return fmt.Errorf("%v uses unsupported filesystem type: %v", mountPoint, fsType)
+ }
+ }
+ }
+ }
+ return nil
+}
diff --git a/cmd/runmqserver/main.go b/cmd/runmqserver/main.go
index 102c81e..acee110 100644
--- a/cmd/runmqserver/main.go
+++ b/cmd/runmqserver/main.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -20,6 +20,7 @@ package main
import (
"context"
"errors"
+ "flag"
"os"
"sync"
@@ -29,12 +30,35 @@ import (
)
func doMain() error {
+ var initFlag = flag.Bool("i", false, "initialize volume only, then exit")
+ var infoFlag = flag.Bool("info", false, "Display debug info, then exit")
+ var devFlag = flag.Bool("dev", false, "used when running this program from runmqdevserver to control log output")
+ flag.Parse()
+
name, nameErr := name.GetQueueManagerName()
mf, err := configureLogger(name)
if err != nil {
logTermination(err)
return err
}
+
+ // Check whether they only want debug info
+ if *infoFlag {
+ logVersionInfo()
+ err = logContainerDetails()
+ if err != nil {
+ log.Printf("Error displaying container details: %v", err)
+ }
+ return nil
+ }
+
+ err = verifySingleProcess()
+ if err != nil {
+ // We don't do the normal termination here as it would create a termination file.
+ log.Error(err)
+ return err
+ }
+
if nameErr != nil {
logTermination(err)
return err
@@ -61,16 +85,12 @@ func doMain() error {
// Enable diagnostic collecting on failure
collectDiagOnFail = true
- err = verifyCurrentUser()
- if err != nil {
- logTermination(err)
- return err
- }
-
- err = logConfig()
- if err != nil {
- logTermination(err)
- return err
+ if *devFlag == false {
+ err = logContainerDetails()
+ if err != nil {
+ logTermination(err)
+ return err
+ }
}
err = createVolume("/mnt/mqm")
@@ -84,6 +104,25 @@ func doMain() error {
return err
}
+ err = createWebConsoleTLSDirStructure()
+ if err != nil {
+ logTermination(err)
+ return err
+ }
+
+ if *devFlag == true {
+ err = createDevTLSDir()
+ if err != nil {
+ logTermination(err)
+ return err
+ }
+ }
+
+ // If init flag is set, exit now
+ if *initFlag {
+ return nil
+ }
+
// Print out versioning information
logVersionInfo()
@@ -129,7 +168,11 @@ func doMain() error {
logTermination(err)
return err
}
- configureQueueManager()
+ err = configureQueueManager()
+ if err != nil {
+ logTermination(err)
+ return err
+ }
enableMetrics := os.Getenv("MQ_ENABLE_METRICS")
if enableMetrics == "true" || enableMetrics == "1" {
@@ -145,7 +188,11 @@ func doMain() error {
// Reap zombies now, just in case we've already got some
signalControl <- reapNow
// Write a file to indicate that chkmqready should now work as normal
- ready.Set()
+ err = ready.Set()
+ if err != nil {
+ logTermination(err)
+ return err
+ }
// Wait for terminate signal
<-signalControl
return nil
diff --git a/cmd/runmqserver/mirror.go b/cmd/runmqserver/mirror.go
index 14f67c3..94c7dfd 100644
--- a/cmd/runmqserver/mirror.go
+++ b/cmd/runmqserver/mirror.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -139,7 +139,10 @@ func mirrorLog(ctx context.Context, wg *sync.WaitGroup, path string, fromStart b
// Always start at the beginning if we've been told to go from the start
if offset != 0 && !fromStart {
log.Debugf("Seeking offset %v in file %v", offset, path)
- f.Seek(offset, 0)
+ _, err = f.Seek(offset, 0)
+ if err != nil {
+ log.Errorf("Unable to return to offset %v: %v", offset, err)
+ }
}
closing := false
for {
@@ -159,7 +162,10 @@ func mirrorLog(ctx context.Context, wg *sync.WaitGroup, path string, fromStart b
// could skip all those messages. This could happen with a very small
// MQ error log size.
mirrorAvailableMessages(f, mf)
- f.Close()
+ err = f.Close()
+ if err != nil {
+ log.Errorf("Unable to close mirror file handle: %v", err)
+ }
// Re-open file
log.Debugf("Re-opening error log file %v", path)
f, err = os.OpenFile(path, os.O_RDONLY, 0)
diff --git a/cmd/runmqserver/mqconfig.go b/cmd/runmqserver/mqconfig.go
deleted file mode 100644
index da8ed2d..0000000
--- a/cmd/runmqserver/mqconfig.go
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-© Copyright IBM Corporation 2017, 2018
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package main
-
-import (
- "fmt"
- "io/ioutil"
- "runtime"
- "strings"
-
- "github.com/genuinetools/amicontained/container"
-)
-
-func logContainerRuntime() error {
- r, err := container.DetectRuntime()
- if err != nil {
- return err
- }
- log.Printf("Container runtime: %v", r)
- return nil
-}
-
-func logBaseImage() error {
- buf, err := ioutil.ReadFile("/etc/os-release")
- if err != nil {
- return err
- }
- lines := strings.Split(string(buf), "\n")
- for _, l := range lines {
- if strings.HasPrefix(l, "PRETTY_NAME=") {
- words := strings.Split(l, "\"")
- if len(words) >= 2 {
- log.Printf("Base image: %v", words[1])
- return nil
- }
- }
- }
- return nil
-}
-
-// logCapabilities logs the Linux capabilities (e.g. setuid, setgid). See https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities
-func logCapabilities() error {
- caps, err := container.Capabilities()
- if err != nil {
- return err
- }
- for k, v := range caps {
- if len(v) > 0 {
- log.Printf("Capabilities (%s set): %v", strings.ToLower(k), strings.Join(v, ","))
- }
- }
- return nil
-}
-
-// logSeccomp logs the seccomp enforcing mode, which affects which kernel calls can be made
-func logSeccomp() error {
- s, err := container.SeccompEnforcingMode()
- if err != nil {
- return err
- }
- log.Printf("seccomp enforcing mode: %v", s)
- return nil
-}
-
-// logSecurityAttributes logs the security attributes of the current process.
-// The security attributes indicate whether AppArmor or SELinux are being used,
-// and what the level of confinement is.
-func logSecurityAttributes() error {
- a, err := readProc("/proc/self/attr/current")
- // On some systems, if AppArmor or SELinux are not installed, you get an
- // error when you try and read `/proc/self/attr/current`, even though the
- // file exists.
- if err != nil || a == "" {
- a = "none"
- }
- log.Printf("Process security attributes: %v", a)
- return nil
-}
-
-func readProc(filename string) (value string, err error) {
- buf, err := ioutil.ReadFile(filename)
- if err != nil {
- return "", err
- }
- return strings.TrimSpace(string(buf)), nil
-}
-
-func readMounts() error {
- all, err := readProc("/proc/mounts")
- if err != nil {
- log.Print("Error: Couldn't read /proc/mounts")
- return err
- }
- lines := strings.Split(all, "\n")
- detected := false
- for i := range lines {
- parts := strings.Split(lines[i], " ")
- //dev := parts[0]
- mountPoint := parts[1]
- fsType := parts[2]
- if strings.Contains(mountPoint, "/mnt/mqm") {
- log.Printf("Detected '%v' volume mounted to %v", fsType, mountPoint)
- detected = true
- }
- }
- if !detected {
- log.Print("No volume detected. Persistent messages may be lost")
- } else {
- return checkFS("/mnt/mqm")
- }
- return nil
-}
-
-func logConfig() error {
- log.Printf("CPU architecture: %v", runtime.GOARCH)
- if runtime.GOOS == "linux" {
- var err error
- osr, err := readProc("/proc/sys/kernel/osrelease")
- if err != nil {
- log.Print(err)
- } else {
- log.Printf("Linux kernel version: %v", osr)
- }
- logContainerRuntime()
- logBaseImage()
- fileMax, err := readProc("/proc/sys/fs/file-max")
- if err != nil {
- log.Print(err)
- } else {
- log.Printf("Maximum file handles: %v", fileMax)
- }
- logUser()
- logCapabilities()
- logSeccomp()
- logSecurityAttributes()
- err = readMounts()
- if err != nil {
- return err
- }
- } else {
- return fmt.Errorf("Unsupported platform: %v", runtime.GOOS)
- }
- return nil
-}
diff --git a/cmd/runmqserver/process.go b/cmd/runmqserver/process.go
new file mode 100644
index 0000000..3f38c25
--- /dev/null
+++ b/cmd/runmqserver/process.go
@@ -0,0 +1,64 @@
+/*
+© Copyright IBM Corporation 2018, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package main
+
+import (
+ "fmt"
+ "os"
+ "path/filepath"
+ "strings"
+
+ "github.com/ibm-messaging/mq-container/internal/command"
+)
+
+// Verifies that we are the main or only instance of this program
+func verifySingleProcess() error {
+ programName, err := determineExecutable()
+ if err != nil {
+ return fmt.Errorf("Failed to determine name of this program - %v", err)
+ }
+
+ // Verify that there is only one runmqserver
+ _, err = verifyOnlyOne(programName)
+ if err != nil {
+ return fmt.Errorf("You cannot run more than one instance of this program")
+ }
+
+ return nil
+}
+
+// Verifies that there is only one instance running of the given program name.
+func verifyOnlyOne(programName string) (int, error) {
+ // #nosec G104
+ out, _, _ := command.Run("ps", "-e", "--format", "cmd")
+ //if this goes wrong then assume we are the only one
+ numOfProg := strings.Count(out, programName)
+ if numOfProg != 1 {
+ return numOfProg, fmt.Errorf("Expected there to be only 1 instance of %s but found %d", programName, numOfProg)
+ }
+ return numOfProg, nil
+}
+
+// Determines the name of the currently running executable.
+func determineExecutable() (string, error) {
+ file, err := os.Executable()
+ if err != nil {
+ return "", err
+ }
+
+ _, exec := filepath.Split(file)
+ return exec, nil
+}
diff --git a/cmd/runmqserver/qmgr.go b/cmd/runmqserver/qmgr.go
index ec9138d..5515cfe 100644
--- a/cmd/runmqserver/qmgr.go
+++ b/cmd/runmqserver/qmgr.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -34,6 +34,7 @@ func createDirStructure() error {
return err
}
log.Println("Created directory structure under /var/mqm")
+
return nil
}
@@ -90,6 +91,7 @@ func configureQueueManager() error {
for _, file := range files {
if strings.HasSuffix(file.Name(), ".mqsc") {
abs := filepath.Join(configDir, file.Name())
+ // #nosec G204
cmd := exec.Command("runmqsc")
stdin, err := cmd.StdinPipe()
if err != nil {
@@ -97,6 +99,7 @@ func configureQueueManager() error {
return err
}
// Open the MQSC file for reading
+ // #nosec G304
f, err := os.Open(abs)
if err != nil {
log.Printf("Error opening %v: %v", abs, err)
@@ -104,14 +107,20 @@ func configureQueueManager() error {
// Copy the contents to stdin of the runmqsc process
_, err = io.Copy(stdin, f)
if err != nil {
- log.Printf("Error reading %v: %v", abs, err)
+ log.Errorf("Error reading %v: %v", abs, err)
+ }
+ err = f.Close()
+ if err != nil {
+ log.Errorf("Failed to close MQSC file handle: %v", err)
+ }
+ err = stdin.Close()
+ if err != nil {
+ log.Errorf("Failed to close MQSC stdin: %v", err)
}
- f.Close()
- stdin.Close()
// Run the command and wait for completion
out, err := cmd.CombinedOutput()
if err != nil {
- log.Println(err)
+ log.Errorf("Error running MQSC file %v (%v):\n\t%v", file.Name(), err, strings.Replace(string(out), "\n", "\n\t", -1))
}
// Print the runmqsc output, adding tab characters to make it more readable as part of the log
log.Printf("Output for \"runmqsc\" with %v:\n\t%v", abs, strings.Replace(string(out), "\n", "\n\t", -1))
@@ -122,7 +131,7 @@ func configureQueueManager() error {
func stopQueueManager(name string) error {
log.Println("Stopping queue manager")
- out, _, err := command.Run("endmqm", "-w", name)
+ out, _, err := command.Run("endmqm", "-w", "-r", name)
if err != nil {
log.Printf("Error stopping queue manager: %v", string(out))
return err
diff --git a/cmd/runmqserver/signals.go b/cmd/runmqserver/signals.go
index 47c3dfb..f5460c8 100644
--- a/cmd/runmqserver/signals.go
+++ b/cmd/runmqserver/signals.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -43,7 +43,8 @@ func signalHandler(qmgr string) chan int {
log.Printf("Signal received: %v", sig)
signal.Stop(reapSignals)
signal.Stop(stopSignals)
- metrics.StopMetricsGathering()
+ metrics.StopMetricsGathering(log)
+ // #nosec G104
stopQueueManager(qmgr)
// One final reap
reapZombies()
diff --git a/cmd/runmqserver/user.go b/cmd/runmqserver/user.go
deleted file mode 100644
index c439b2d..0000000
--- a/cmd/runmqserver/user.go
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-© Copyright IBM Corporation 2018
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package main
-
-import (
- "fmt"
- "os/user"
- "strings"
-
- "github.com/ibm-messaging/mq-container/internal/command"
-)
-
-const groupName string = "supplgrp"
-
-func verifyCurrentUser() error {
- log.Debug("Verifying current user information")
- curUser, err := user.Current()
- if err != nil {
- return err
- }
- log.Debugf("Detected current user as: %v+", curUser)
- if curUser.Username == "mqm" {
- // Not supported yet
- return fmt.Errorf("Container is running as mqm user which is not supported. Please run this container as root")
- } else if curUser.Username == "root" {
- // We're running as root so need to check for supplementary groups.
- // We can't use the golang User.GroupIDs as it doesn't seem to detect container supplementary groups..
- groups, err := getCurrentUserGroups()
- for _, e := range groups {
- _, _, testGroup := command.Run("getent", "group", e)
- if testGroup != nil {
- log.Printf("Group %s does not exist on the system... Adding to system and MQM user", e)
- _, _, err = command.Run("groupadd", "-g", e, groupName)
- if err != nil {
- log.Errorf("Failed to create group %s as %s", e, groupName)
- return err
- }
- _, _, err = command.Run("usermod", "-aG", groupName, "mqm")
- if err != nil {
- log.Errorf("Failed to add group %s(%s) to the mqm user.", groupName, e)
- return err
- }
- }
- }
- } else {
- // We're running as an unknown user...
- return fmt.Errorf("Container is running as %s user which is not supported. Please run this container as root", curUser.Username)
- }
-
- return nil
-}
-
-func logUser() {
- u, usererr := user.Current()
- if usererr == nil {
- g, err := getCurrentUserGroups()
- if err != nil && len(g) == 0 {
- log.Printf("Running as user ID %v (%v) with primary group %v", u.Uid, u.Name, u.Gid)
- } else {
- // Look for the primary group in the list of group IDs
- for i, v := range g {
- if v == u.Gid {
- // Remove the element from the slice
- g = append(g[:i], g[i+1:]...)
- }
- }
- log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.Uid, u.Name, u.Gid, strings.Join(g, ","))
- }
- }
-
- if usererr == nil && u.Username != "mqm" {
- mqm, err := user.Lookup("mqm")
- // Need to print out mqm user details as well.
- g, err := getUserGroups(mqm)
- if err != nil && len(g) == 0 {
- log.Printf("MQM user ID %v (%v) has primary group %v", mqm.Uid, "mqm", mqm.Gid)
- } else {
- // Look for the primary group in the list of group IDs
- for i, v := range g {
- if v == mqm.Gid {
- // Remove the element from the slice
- g = append(g[:i], g[i+1:]...)
- }
- }
- log.Printf("MQM user ID %v (%v) has primary group %v, and supplementary groups %v", mqm.Uid, "mqm", mqm.Gid, strings.Join(g, ","))
- }
- }
-}
-
-func getCurrentUserGroups() ([]string, error) {
- var nilArray []string
- out, _, err := command.Run("id", "--groups")
- if err != nil {
- log.Debug("Unable to get current user groups")
- return nilArray, err
- }
-
- out = strings.TrimSpace(out)
- if out == "" {
- // we don't have any groups?
- return nilArray, fmt.Errorf("Unable to determine groups for current user")
- }
-
- groups := strings.Split(out, " ")
- return groups, nil
-}
-
-func getUserGroups(usr *user.User) ([]string, error) {
- var nilArray []string
- out, _, err := command.Run("id", "--groups", usr.Uid)
- if err != nil {
- log.Debugf("Unable to get user %s groups", usr.Uid)
- return nilArray, err
- }
-
- out = strings.TrimSpace(out)
- if out == "" {
- // we don't have any groups?
- return nilArray, fmt.Errorf("Unable to determine groups for user %s", usr.Uid)
- }
-
- groups := strings.Split(out, " ")
- return groups, nil
-}
diff --git a/cmd/runmqserver/version.go b/cmd/runmqserver/version.go
index 35af770..ec21f37 100644
--- a/cmd/runmqserver/version.go
+++ b/cmd/runmqserver/version.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@ var (
ImageRevision = "Not specified"
// ImageSource is the URL to get source code for building the image
ImageSource = "Not specified"
+ // ImageTag is the tag of the image
+ ImageTag = "Not specified"
)
func logDateStamp() {
@@ -43,6 +45,10 @@ func logGitCommit() {
log.Printf("Image source: %v", ImageSource)
}
+func logImageTag() {
+ log.Printf("Image tag: %v", ImageTag)
+}
+
func logMQVersion() {
mqVersion, _, err := command.Run("dspmqver", "-b", "-f", "2")
if err != nil {
@@ -67,5 +73,6 @@ func logVersionInfo() {
logDateStamp()
logGitRepo()
logGitCommit()
+ logImageTag()
logMQVersion()
}
diff --git a/cmd/runmqserver/webserver.go b/cmd/runmqserver/webserver.go
index 9c82a1d..7537864 100644
--- a/cmd/runmqserver/webserver.go
+++ b/cmd/runmqserver/webserver.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@ import (
"io"
"os"
"os/exec"
+ "os/user"
"path/filepath"
+ "strconv"
"strings"
"syscall"
@@ -43,12 +45,23 @@ func startWebServer() error {
// Take all current environment variables, and add the app password
cmd.Env = append(os.Environ(), "MQ_APP_PASSWORD=passw0rd")
}
- cmd.SysProcAttr = &syscall.SysProcAttr{}
uid, gid, err := command.LookupMQM()
if err != nil {
return err
}
- cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+ u, err := user.Current()
+ if err != nil {
+ return err
+ }
+ currentUID, err := strconv.Atoi(u.Uid)
+ if err != nil {
+ return fmt.Errorf("Error converting UID to string: %v", err)
+ }
+ // Add credentials to run as 'mqm', only if we aren't already 'mqm'
+ if currentUID != uid {
+ cmd.SysProcAttr = &syscall.SysProcAttr{}
+ cmd.SysProcAttr.Credential = &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
+ }
out, rc, err := command.RunCmd(cmd)
if err != nil {
log.Printf("Error %v starting web server: %v", rc, string(out))
@@ -123,34 +136,14 @@ func configureSSO_TLS() error {
// Create tls directory
dir := "/run/tls"
- _, err := os.Stat(dir)
- if err != nil {
- if os.IsNotExist(err) {
- err = os.MkdirAll(dir, 0770)
- if err != nil {
- return err
- }
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(dir, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
- } else {
- return err
- }
- }
+ mntdir := "/mnt/tls/"
// Setup key store & trust store
ks := keystore.NewJKSKeyStore(filepath.Join(dir, "key.jks"), "password")
ts := keystore.NewJKSKeyStore(filepath.Join(dir, "trust.jks"), "password")
log.Debug("Creating key store")
- err = ks.Create(log)
+ err := ks.Create(log)
if err != nil {
return err
}
@@ -160,12 +153,12 @@ func configureSSO_TLS() error {
return err
}
log.Debug("Generating PKCS12 file")
- err = ks.GeneratePKCS12("/mnt/tls/tls.key", "/mnt/tls/tls.crt", "/run/tls/tls.p12", "default", "password")
+ err = ks.GeneratePKCS12(filepath.Join(mntdir, "tls.key"), filepath.Join(mntdir, "tls.crt"), filepath.Join(dir, "tls.p12"), "default", "password")
if err != nil {
return err
}
log.Debug("Importing certificate into key store")
- err = ks.Import("/run/tls/tls.p12", "password")
+ err = ks.Import(filepath.Join(dir, "tls.p12"), "password")
if err != nil {
return err
}
@@ -190,10 +183,6 @@ func configureWebServer() error {
}
return err
}
- uid, gid, err := command.LookupMQM()
- if err != nil {
- return err
- }
const prefix string = "/etc/mqm/web"
err = filepath.Walk(prefix, func(from string, info os.FileInfo, err error) error {
if err != nil {
@@ -229,10 +218,6 @@ func configureWebServer() error {
return err
}
}
- err = os.Chown(to, uid, gid)
- if err != nil {
- return err
- }
return nil
})
return err
diff --git a/docs/building.md b/docs/building.md
index 33dda86..96bec9f 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -1,25 +1,46 @@
-# Building a Docker image
+# Building a container image
## Prerequisites
-You need to ensure you have the following tools installed:
+
+### Prerequisites for building an Ubuntu image
+If you want to build a container image with Ubuntu Linux as the base OS, then you need to have the following tools installed:
+
* [Docker](https://www.docker.com/) V17.06.1 or later
* [GNU make](https://www.gnu.org/software/make/)
If you are working in the Windows Subsystem for Linux, follow [this guide by Microsoft to set up Docker](https://blogs.msdn.microsoft.com/commandline/2017/12/08/cross-post-wsl-interoperability-with-docker/) first.
+### Prerequisites for building a Red Hat Enterprise Linux image
+If you want to build a container image with Red Hat Enterprise Linux as the base OS, then you need to use a host server with Red Hat Enterprise Linux. You must also have the following tools installed:
+
+* [`buildah`](https://buildah.io) (available in `rhel-7-server-extras`)
+* [`podman`](https://podman.io) (available in `rhel-7-server-extras`)
+
+In addition, you need the following commonly installed tools:
+
+* `bash`
+* `coreutils`
+* `findutils`
+* `make`
+* `sed`
+* `shadow-utils`
+* `tar`
+
## Building a production image
This procedure works for building the MQ Continuous Delivery release, on `x86_64`, `ppc64le` and `s390x` architectures.
1. Create a `downloads` directory in the root of this repository
-2. Download MQ from IBM Passport Advantage, and place the downloaded file (for example, `IBM_MQ_9.1.0.0_UBUNTU_X86-64.tar.gz` for MQ V9.1.0 for Ubuntu on x86_64 architecture) in the `downloads` directory
-2. Run `make build-advancedserver`
+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.1_UBUNTU_X86-64.tar.gz` for MQ V9.1.1 for Ubuntu on x86_64 architecture) in the `downloads` directory
+3. 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 package is called "MQ for Ubuntu", and contains DEB files for installing on Ubuntu.
+On a Red Hat Enterprise Linux host, the command `make build-advancedserver` will build a container image using Red Hat Enterprise Linux as the base. On all other hosts, the base image will be Ubuntu.
+
You can build a different version of MQ by setting the `MQ_VERSION` environment variable, for example:
```bash
-MQ_VERSION=9.0.5.0 make build-advancedserver
+MQ_VERSION=9.1.0.0 make build-advancedserver
```
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:
@@ -29,22 +50,10 @@ MQ_ARCHIVE=mq-1.2.3.4.tar.gz MQ_VERSION=1.2.3.4 make build-advancedserver
```
## Building a developer image
-Run `make build-devserver`, which will download the latest version of MQ Advanced for Developers from IBM developerWorks. This is currently only available on the `x86_64` architecture.
+Run `make build-devserver`, which will download the latest version of MQ Advanced for Developers from IBM developerWorks. This is currently only available on the `x86_64` architecture. On a Red Hat Enterprise Linux host, this command will build a container image using Red Hat Enterprise Linux as the base. On all other hosts, the base image will be Ubuntu.
You can use the environment variable `MQ_ARCHIVE_DEV` to specify an alternative local file to install from (which must be in the `downloads` directory).
-## Building on a different base image
-By default, the MQ images use Ubuntu as the base layer. You can build using a Red Hat Enterprise Linux compatible base layer by setting the `BASE_IMAGE` environment variable. For example:
-
-```
-BASE_IMAGE=centos:7 make build-advancedserver
-```
-
-The `make` tool will try and locate the right archive file under the `downloads` directory, based on your platform architecture and your `MQ_VERSION` environment variable, for example `IBM_MQ_9.1.0.0_LINUX_X86_64.tar.gz` for MQ V9.1.0.0 on x86_64. You can also set the `MQ_ARCHIVE` environment variable to set the specific file name.
-
-Note that if you are using Red Hat Enterprise Linux, you will need to create your own base image layer, with your subscription enabled, as described [here](https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux_atomic_host/7/html/getting_started_with_containers/get_started_with_docker_formatted_container_images). The MQ image build needs to install some additional packages, and a subscription is required to access the Red Hat repositories.
-
-
## Installed components
-This image includes the core MQ server, Java, language packs, and GSKit. This can be configured by setting the `MQ_PACKAGES` argument to `make`, or directly as a [Docker build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables-build-arg).
+This image includes the core MQ server, Java, language packs, and GSKit. This can be configured by setting the `MQ_PACKAGES` argument to `make`. For the Ubuntu-based image, you can also directly set a [Docker build argument](https://docs.docker.com/engine/reference/commandline/build/#set-build-time-variables-build-arg).
diff --git a/docs/security.md b/docs/security.md
new file mode 100644
index 0000000..d6d6077
--- /dev/null
+++ b/docs/security.md
@@ -0,0 +1,39 @@
+# Security
+
+## Container runtime
+
+### User
+
+The MQ server image is run using the "mqm" user. On the Ubuntu-based image, this uses the UID and GID of 999. On the Red Hat Enterprise Linux image, it uses the UID and GID of 888.
+
+### Capabilities
+
+The MQ Advanced image requires no Linux capabilities, so you can drop any capabilities which are added by default. For example, in Docker you could do the following:
+
+```sh
+docker run \
+ --cap-drop=ALL \
+ --env LICENSE=accept \
+ --env MQ_QMGR_NAME=QM1 \
+ --detach \
+ mqadvanced-server:9.1.1.0-x86_64-ubuntu-16.04
+```
+
+The MQ Advanced for Developers image does requires 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:
+
+```sh
+docker run \
+ --cap-drop=ALL \
+ --cap-add=CHOWN \
+ --cap-add=SETUID \
+ --cap-add=SETGID \
+ --cap-add=AUDIT_WRITE \
+ --env LICENSE=accept \
+ --env MQ_QMGR_NAME=QM1 \
+ --detach \
+ mqadvanced-server-dev:9.1.1.0-x86_64-ubuntu-16.04
+```
+
+### SELinux
+
+The SELinux label "spc_t" (super-privileged container) is needed to run the MQ container on a host with SELinux enabled. This is due to a current limitation in how MQ data is stored on volumes, which violates the usual policy applied when using the standard "container_t" label.
\ No newline at end of file
diff --git a/docs/testing.md b/docs/testing.md
index e66d0d8..ba398b4 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -8,6 +8,12 @@ You need to ensure you have the following tools installed:
* [dep](https://github.com/golang/dep) (official Go dependency management tool) - needed to prepare for running the tests
* [Helm](https://helm.sh) - only needed for running the Kubernetes tests
+### Prerequisites for testing a RedHat image
+If you want to test a container image with Red Hat Enterprise Linux as the base OS, then you need to use a host server with Red Hat Enterprise Linux. You must also have the following tools installed:
+
+* [Yum](http://yum.baseurl.org/) (available in `rhel-7-server-extras`)
+* [Buildah](https://buildah.io) (available in `rhel-7-server-extras`)
+
## Running the tests
There are two main sets of tests:
@@ -25,7 +31,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=mqadvanced-server:9.1.0.0-x86_64-ubuntu-16.04 make test-advancedserver
+MQ_IMAGE_ADVANCEDSERVER=mqadvanced-server:9.1.1.0-x86_64-ubuntu-16.04 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::
@@ -34,10 +40,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 `mqadvanced-server:9.0.5.0-x86_64-ubuntu-16.04`:
+You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `mqadvanced-server:9.1.0.0-x86_64-ubuntu-16.04`:
```
-MQ_VERSION=9.0.5.0 make test-advancedserver
+MQ_VERSION=9.1.0.0 make test-advancedserver
```
### Running the Docker tests with code coverage
diff --git a/docs/usage.md b/docs/usage.md
index 007a9a2..a9311fe 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -5,7 +5,7 @@ In order to use the image, it is necessary to accept the terms of the IBM MQ lic
## Running with the default configuration
You can run a queue manager with the default configuration and a listener on port 1414 using the following command. For example, the following command creates and starts a queue manager called `QM1`, and maps port 1414 on the host to the MQ listener on port 1414 inside the container, as well as port 9443 on the host to the web console on port 9443 inside the container:
-```
+```sh
docker run \
--env LICENSE=accept \
--env MQ_QMGR_NAME=QM1 \
@@ -16,15 +16,15 @@ docker run \
```
## Running with the default configuration and a volume
-The above example will not persist any configuration data or messages across container runs. In order to do this, you need to use a [volume](https://docs.docker.com/engine/admin/volumes/volumes/). For example, you can create a volume with the following command:
+The above example will not persist any configuration data or messages across container runs. In order to do this, you need to use a [volume](https://docs.docker.com/storage/volumes/). For example, you can create a volume with the following command:
-```
+```sh
docker volume create qm1data
```
You can then run a queue manager using this volume as follows:
-```
+```sh
docker run \
--env LICENSE=accept \
--env MQ_QMGR_NAME=QM1 \
@@ -40,7 +40,7 @@ The Docker image always uses `/mnt/mqm` for MQ data, which is correctly linked f
## Running with the default configuration and Prometheus metrics enabled
You can run a queue manager with [Prometheus](https://prometheus.io) metrics enabled. The following command will generate Prometheus metrics for your queue manager on `/metrics` port `9157`:
-```
+```sh
docker run \
--env LICENSE=accept \
--env MQ_QMGR_NAME=QM1 \
@@ -58,34 +58,36 @@ 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](http://www-01.ibm.com/support/knowledgecenter/SSFKSJ_9.0.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.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.
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 `config.mqsc` 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, and an administrative user `alice`. Note that it is not normally recommended to include passwords in this way:
```dockerfile
FROM ibmcom/mq
+USER root
RUN useradd alice -G mqm && \
echo alice:passw0rd | chpasswd
+USER mqm
COPY 20-config.mqsc /etc/mqm/
```
-Here is an example corresponding `20-config.mqsc` script from the [mqdev blog](https://www.ibm.com/developerworks/community/blogs/messaging/entry/getting_going_without_turning_off_mq_security?lang=en), which allows users with passwords to connect on the `PASSWORD.SVRCONN` channel:
+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
+DEFINE QLOCAL(MY.QUEUE.1) REPLACE
+DEFINE QLOCAL(MY.QUEUE.2) REPLACE
```
-DEFINE CHANNEL(PASSWORD.SVRCONN) CHLTYPE(SVRCONN) REPLACE
-SET CHLAUTH(PASSWORD.SVRCONN) TYPE(BLOCKUSER) USERLIST('nobody') DESCR('Allow privileged users on this channel')
-SET CHLAUTH('*') TYPE(ADDRESSMAP) ADDRESS('*') USERSRC(NOACCESS) DESCR('BackStop rule')
-SET CHLAUTH(PASSWORD.SVRCONN) TYPE(ADDRESSMAP) ADDRESS('*') USERSRC(CHANNEL) CHCKCLNT(REQUIRED)
-ALTER AUTHINFO(SYSTEM.DEFAULT.AUTHINFO.IDPWOS) AUTHTYPE(IDPWOS) ADOPTCTX(YES)
-REFRESH SECURITY TYPE(CONNAUTH)
-```
+
+The file `20-config.mqsc` should be saved into the same directory as the `Dockerfile`.
## Running MQ commands
It is recommended that you configure MQ in your own custom image. However, you may need to run MQ commands directly inside the process space of the container. To run a command against a running queue manager, you can use `docker exec`, for example:
-```
+```sh
docker exec \
--tty \
--interactive \
diff --git a/incubating/Dockerfile-sfbridge b/incubating/Dockerfile-sfbridge
index 134cc4f..7a6e9a6 100644
--- a/incubating/Dockerfile-sfbridge
+++ b/incubating/Dockerfile-sfbridge
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2015, 2017
+# © Copyright IBM Corporation 2015, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,14 +15,16 @@
FROM ubuntu:16.04
# The URL to download the MQ installer from in tar.gz format
-ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz
+ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev911_ubuntu_x86-64.tar.gz
# The MQ packages to install
ARG MQ_PACKAGES="ibmmq-sfbridge"
+ARG MQM_UID=999
+
ADD install-mq.sh /usr/local/bin/
RUN chmod u+x /usr/local/bin/install-mq.sh \
- && install-mq.sh
+ && install-mq.sh $MQM_UID
ENV LANG=en_US.UTF-8
diff --git a/incubating/mq-explorer/Dockerfile b/incubating/mq-explorer/Dockerfile
index 0deffcb..327c901 100644
--- a/incubating/mq-explorer/Dockerfile
+++ b/incubating/mq-explorer/Dockerfile
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2015, 2017
+# © Copyright IBM Corporation 2015, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,10 +15,12 @@
FROM ubuntu:16.04
# The URL to download the MQ installer from in tar.gz format
-ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz
+ARG MQ_URL=https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev911_ubuntu_x86-64.tar.gz
# The MQ packages to install
-ARG MQ_PACKAGES="ibmmq-explorer"
+ARG MQ_PACKAGES
+
+ARG MQM_UID=999
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
diff --git a/incubating/mq-golang-sdk/Dockerfile b/incubating/mq-golang-sdk/Dockerfile
index 584992d..ff5dc3b 100644
--- a/incubating/mq-golang-sdk/Dockerfile
+++ b/incubating/mq-golang-sdk/Dockerfile
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,8 +11,8 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
-ARG BASE_IMAGE=mq-sdk:9.0.5.0-x86_64-ubuntu-16.04
+
+ARG BASE_IMAGE=mq-sdk:9.1.1.0-x86_64-ubuntu-16.04
FROM $BASE_IMAGE
@@ -30,4 +30,4 @@ RUN chmod +x /usr/local/bin/install-golang.sh \
&& sleep 1 \
&& install-golang.sh
-WORKDIR $GOPATH
+WORKDIR $GOPATH
\ No newline at end of file
diff --git a/incubating/mq-sdk/Dockerfile b/incubating/mq-sdk/Dockerfile
index 7fb304e..a7a8833 100644
--- a/incubating/mq-sdk/Dockerfile
+++ b/incubating/mq-sdk/Dockerfile
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@ ARG MQ_URL
# The packages to install in install-mq.sh
ARG MQ_PACKAGES
+ARG MQM_UID=999
+
COPY install-mq.sh /usr/local/bin/
# Install MQ. To avoid a "text file busy" error here, we sleep before installing.
@@ -30,6 +32,6 @@ COPY install-mq.sh /usr/local/bin/
# errors with some commands (e.g. `dspmqver`)
RUN chmod u+x /usr/local/bin/install-mq.sh \
&& sleep 1 \
- && install-mq.sh \
+ && install-mq.sh $MQM_UID \
&& rm -rf /var/mqm \
&& /opt/mqm/bin/crtmqdir -f -s
diff --git a/incubating/mqadvanced-server-dev/10-dev.mqsc.tpl b/incubating/mqadvanced-server-dev/10-dev.mqsc.tpl
index dd46bea..987e8e3 100644
--- a/incubating/mqadvanced-server-dev/10-dev.mqsc.tpl
+++ b/incubating/mqadvanced-server-dev/10-dev.mqsc.tpl
@@ -1,4 +1,4 @@
-* © Copyright IBM Corporation 2017, 2018
+* © Copyright IBM Corporation 2017, 2019
*
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-STOP LISTENER('SYSTEM.LISTENER.TCP.1')
+STOP LISTENER('SYSTEM.LISTENER.TCP.1') IGNSTATE(YES)
* Developer queues
DEFINE QLOCAL('DEV.QUEUE.1') REPLACE
@@ -50,4 +50,4 @@ SET AUTHREC PROFILE('DEV.**') GROUP('mqclient') OBJTYPE(TOPIC) AUTHADD(PUB,SUB)
* Developer listener
DEFINE LISTENER('DEV.LISTENER.TCP') TRPTYPE(TCP) PORT(1414) CONTROL(QMGR) REPLACE
-START LISTENER('DEV.LISTENER.TCP')
+START LISTENER('DEV.LISTENER.TCP') IGNSTATE(YES)
diff --git a/incubating/mqadvanced-server-dev/Dockerfile b/incubating/mqadvanced-server-dev/Dockerfile
index e7cc68c..abcbe72 100644
--- a/incubating/mqadvanced-server-dev/Dockerfile
+++ b/incubating/mqadvanced-server-dev/Dockerfile
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2015, 2018
+# © Copyright IBM Corporation 2015, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ARG BASE_IMAGE=mqadvanced-server-dev-base:9.0.5.0-x86_64-ubuntu-16.04
-ARG BUILDER_IMAGE=mq-golang-sdk:9.0.5.0-x86_64-ubuntu-16.04
+ARG BASE_IMAGE=mqadvanced-server-dev-base:9.1.1.0-x86_64-ubuntu-16.04
+ARG BUILDER_IMAGE=mq-golang-sdk:9.1.1.0-x86_64-ubuntu-16.04
###############################################################################
# Build stage to build Go code
@@ -21,12 +21,13 @@ ARG BUILDER_IMAGE=mq-golang-sdk:9.0.5.0-x86_64-ubuntu-16.04
FROM $BUILDER_IMAGE as builder
ARG IMAGE_REVISION="Not specified"
ARG IMAGE_SOURCE="Not specified"
+ARG IMAGE_TAG="Not specified"
WORKDIR /go/src/github.com/ibm-messaging/mq-container/
COPY cmd/ ./cmd
COPY internal/ ./internal
COPY vendor/ ./vendor
# Re-build runmqserver, with code tagged with 'mqdev' enabled
-RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\"" --tags 'mqdev' ./cmd/runmqserver
+RUN go build -ldflags "-X \"main.ImageCreated=$(date --iso-8601=seconds)\" -X \"main.ImageRevision=$IMAGE_REVISION\" -X \"main.ImageSource=$IMAGE_SOURCE\" -X \"main.ImageTag=$IMAGE_TAG\"" --tags 'mqdev' ./cmd/runmqserver
RUN go build ./cmd/runmqdevserver/
# Run all unit tests
RUN go test -v ./cmd/runmqdevserver/...
@@ -42,6 +43,20 @@ ENV MQ_DEV=true
# Default administrator password
ENV MQ_ADMIN_PASSWORD=passw0rd
+ARG MQM_UID=999
+
+USER root
+
+COPY incubating/mqadvanced-server-dev/install-extra-packages.sh /usr/local/bin/
+
+RUN chmod u+x /usr/local/bin/install-extra-packages.sh \
+ && sleep 1 \
+ && install-extra-packages.sh
+
+# WARNING: This is what allows the mqm user to change the password of any other user
+# It's used by runmqdevserver to change the admin/app passwords.
+RUN echo "mqm ALL = NOPASSWD: /usr/sbin/chpasswd" > /etc/sudoers.d/mq-dev-config
+
## Add admin and app users, and set a default password for admin
RUN useradd admin -G mqm \
&& groupadd mqclient \
@@ -54,10 +69,16 @@ RUN mkdir -p /run/runmqdevserver \
COPY --from=builder /go/src/github.com/ibm-messaging/mq-container/runmqserver /usr/local/bin/
COPY --from=builder /go/src/github.com/ibm-messaging/mq-container/runmqdevserver /usr/local/bin/
+
# Copy template files
COPY incubating/mqadvanced-server-dev/*.tpl /etc/mqm/
# Copy web XML files for default developer configuration
COPY incubating/mqadvanced-server-dev/web /etc/mqm/web
-RUN chmod +x /usr/local/bin/runmq*
+
+RUN chown -R mqm:mqm /etc/mqm/* \
+ && chmod +x /usr/local/bin/runmq* \
+ && install --directory --mode 0775 --owner mqm --group root /run/runmqdevserver
+
+USER $MQM_UID
ENTRYPOINT ["runmqdevserver"]
diff --git a/incubating/mqadvanced-server-dev/install-extra-packages.sh b/incubating/mqadvanced-server-dev/install-extra-packages.sh
new file mode 100644
index 0000000..fd3fa8a
--- /dev/null
+++ b/incubating/mqadvanced-server-dev/install-extra-packages.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# © Copyright IBM Corporation 2019
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+test -f /usr/bin/yum && RHEL=true || RHEL=false
+test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
+
+if ($UBUNTU); then
+ export DEBIAN_FRONTEND=noninteractive
+ apt-get update
+ apt-get install -y --no-install-recommends sudo
+ rm -rf /var/lib/apt/lists/*
+fi
+
+if ($RHEL); then
+ yum -y install sudo
+ yum -y clean all
+ rm -rf /var/cache/yum/*
+fi
diff --git a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml b/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml
index fb1f855..d4c2945 100644
--- a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml
+++ b/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/mqwebuser.xml
@@ -1,5 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
appSecurity-2.0
basicAuthenticationMQ-1.0
@@ -35,5 +60,6 @@
+
diff --git a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls-dev.xml b/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls-dev.xml
index 903656c..37645dd 100644
--- a/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls-dev.xml
+++ b/incubating/mqadvanced-server-dev/web/installations/Installation1/servers/mqweb/tls-dev.xml
@@ -1,5 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/install-build-deps-ubuntu.sh b/install-build-deps-ubuntu.sh
new file mode 100755
index 0000000..546200a
--- /dev/null
+++ b/install-build-deps-ubuntu.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# © Copyright IBM Corporation 2015, 2019
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Install Docker and dep, required by build (assumes Ubuntu host, as used by Travis build)
+
+set -ex
+
+curl https://glide.sh/get | sh
+sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64
+sudo chmod +x /usr/local/bin/dep
+
+go get -u golang.org/x/lint/golint
diff --git a/install-mq.sh b/install-mq.sh
index 141dc9d..5fdf00e 100644
--- a/install-mq.sh
+++ b/install-mq.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# -*- mode: sh -*-
-# © Copyright IBM Corporation 2015, 2018
+# © Copyright IBM Corporation 2015, 2019
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,8 @@
# Fail on any non-zero return code
set -ex
+mqm_uid=${1:-999}
+
test -f /usr/bin/yum && RHEL=true || RHEL=false
test -f /usr/bin/apt-get && UBUNTU=true || UBUNTU=false
@@ -104,11 +106,8 @@ $UBUNTU && apt-get purge -y \
$UBUNTU && apt-get autoremove -y
# Recommended: Create the mqm user ID with a fixed UID and group, so that the file permissions work between different images
-$UBUNTU && groupadd --system --gid 999 mqm
-$UBUNTU && useradd --system --uid 999 --gid mqm mqm
-$RHEL && groupadd --system --gid 888 mqm
-$RHEL && useradd --system --uid 888 --gid mqm mqm
-usermod -aG mqm root
+groupadd --system --gid ${mqm_uid} mqm
+useradd --system --uid ${mqm_uid} --gid mqm --groups 0 mqm
# Find directory containing .deb files
$UBUNTU && DIR_DEB=$(find ${DIR_EXTRACT} -name "*.deb" -printf "%h\n" | sort -u | head -1)
@@ -141,7 +140,7 @@ rm -rf ${DIR_EXTRACT}
# Apply any bug fixes not included in base Ubuntu or MQ image.
# Don't upgrade everything based on Docker best practices https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#run
-$UBUNTU && apt-get install -y libsystemd0 systemd systemd-sysv libudev1 perl-base --only-upgrade
+$UBUNTU && apt-get install -y libapparmor1 libsystemd0 systemd systemd-sysv libudev1 perl-base --only-upgrade
# End of bug fixes
# Clean up cached files
@@ -155,16 +154,18 @@ $UBUNTU && echo "mq:$(dspmqver -b -f 2)" > /etc/debian_chroot
# Remove the directory structure under /var/mqm which was created by the installer
rm -rf /var/mqm
-# Create the mount point for volumes
-mkdir -p /mnt/mqm
+# Create the mount point for volumes, ensuring MQ has permissions to all directories
+install --directory --mode 0775 --owner mqm --group root /mnt
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm
+install --directory --mode 0775 --owner mqm --group root /mnt/mqm/data
# Create the directory for MQ configuration files
-mkdir -p /etc/mqm
+install --directory --mode 0775 --owner mqm --group root /etc/mqm
# Create a symlink for /var/mqm -> /mnt/mqm/data
ln -s /mnt/mqm/data /var/mqm
-# Optional: Set these values for the Bluemix Vulnerability Report
+# Optional: Ensure any passwords expire in a timely manner
sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t90/' /etc/login.defs
sed -i 's/PASS_MIN_DAYS\t0/PASS_MIN_DAYS\t1/' /etc/login.defs
diff --git a/internal/command/command.go b/internal/command/command.go
index 024b877..75322e8 100644
--- a/internal/command/command.go
+++ b/internal/command/command.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -53,11 +53,13 @@ func RunCmd(cmd *exec.Cmd) (string, int, error) {
// Do not use this function to run shell built-ins (like "cd"), because
// the error handling works differently
func Run(name string, arg ...string) (string, int, error) {
+ // #nosec G204
return RunCmd(exec.Command(name, arg...))
}
// RunAsMQM runs the specified command as the mqm user
func RunAsMQM(name string, arg ...string) (string, int, error) {
+ // #nosec G204
cmd := exec.Command(name, arg...)
cmd.SysProcAttr = &syscall.SysProcAttr{}
uid, gid, err := LookupMQM()
diff --git a/internal/containerruntime/runtime.go b/internal/containerruntime/runtime.go
new file mode 100644
index 0000000..49c53d1
--- /dev/null
+++ b/internal/containerruntime/runtime.go
@@ -0,0 +1,109 @@
+/*
+© Copyright IBM Corporation 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package runtime
+
+import (
+ "fmt"
+ "io/ioutil"
+ "strings"
+
+ "github.com/genuinetools/amicontained/container"
+)
+
+func GetContainerRuntime() (string, error) {
+ return container.DetectRuntime()
+}
+
+func GetBaseImage() (string, error) {
+ buf, err := ioutil.ReadFile("/etc/os-release")
+ if err != nil {
+ return "", fmt.Errorf("Failed to read /etc/os-release: %v", err)
+ }
+ lines := strings.Split(string(buf), "\n")
+ for _, l := range lines {
+ if strings.HasPrefix(l, "PRETTY_NAME=") {
+ words := strings.Split(l, "\"")
+ if len(words) >= 2 {
+ return words[1], nil
+ }
+ }
+ }
+ return "unknown", nil
+}
+
+// GetCapabilities gets the Linux capabilities (e.g. setuid, setgid). See https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities
+func GetCapabilities() (map[string][]string, error) {
+ return container.Capabilities()
+}
+
+// GetSeccomp gets the seccomp enforcing mode, which affects which kernel calls can be made
+func GetSeccomp() (string, error) {
+ s, err := container.SeccompEnforcingMode()
+ if err != nil {
+ return "", fmt.Errorf("Failed to get container SeccompEnforcingMode: %v", err)
+ }
+ return s, nil
+}
+
+// GetSecurityAttributes gets the security attributes of the current process.
+// The security attributes indicate whether AppArmor or SELinux are being used,
+// and what the level of confinement is.
+func GetSecurityAttributes() string {
+ a, err := readProc("/proc/self/attr/current")
+ // On some systems, if AppArmor or SELinux are not installed, you get an
+ // error when you try and read `/proc/self/attr/current`, even though the
+ // file exists.
+ if err != nil || a == "" {
+ a = "none"
+ }
+ return a
+}
+
+func readProc(filename string) (value string, err error) {
+ // #nosec G304
+ buf, err := ioutil.ReadFile(filename)
+ if err != nil {
+ return "", err
+ }
+ return strings.TrimSpace(string(buf)), nil
+}
+
+func GetMounts() (map[string]string, error) {
+ all, err := readProc("/proc/mounts")
+ if err != nil {
+ return nil, fmt.Errorf("Couldn't read /proc/mounts")
+ }
+ result := make(map[string]string)
+ lines := strings.Split(all, "\n")
+ for i := range lines {
+ parts := strings.Split(lines[i], " ")
+ //dev := parts[0]
+ mountPoint := parts[1]
+ fsType := parts[2]
+ if strings.Contains(mountPoint, "/mnt/mqm") {
+ result[mountPoint] = fsType
+ }
+ }
+ return result, nil
+}
+
+func GetKernelVersion() (string, error) {
+ return readProc("/proc/sys/kernel/osrelease")
+}
+
+func GetMaxFileHandles() (string, error) {
+ return readProc("/proc/sys/fs/file-max")
+}
diff --git a/cmd/runmqserver/mqconfig_linux.go b/internal/containerruntime/runtime_linux.go
similarity index 87%
rename from cmd/runmqserver/mqconfig_linux.go
rename to internal/containerruntime/runtime_linux.go
index 2a07aa4..94c99c3 100644
--- a/cmd/runmqserver/mqconfig_linux.go
+++ b/internal/containerruntime/runtime_linux.go
@@ -1,7 +1,7 @@
// +build linux
/*
-© 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.
@@ -15,11 +15,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-package main
+package runtime
import (
- "fmt"
-
"golang.org/x/sys/unix"
)
@@ -101,24 +99,27 @@ var fsTypes = map[int64]string{
0x58295829: "zsmalloc",
}
-func checkFS(path string) error {
+// GetFilesystem returns the filesystem type for the specified path
+func GetFilesystem(path string) (string, error) {
statfs := &unix.Statfs_t{}
err := unix.Statfs(path, statfs)
if err != nil {
- log.Println(err)
- return nil
+ return "", err
}
// Use a type conversion to make type an int64. On s390x it's a uint32.
t, ok := fsTypes[int64(statfs.Type)]
if !ok {
- log.Printf("WARNING: detected %v has unknown filesystem type %x", path, statfs.Type)
- return nil
+ return "unknown", nil
}
- switch t {
+ return t, nil
+}
+
+// SupportedFilesystem returns true if the supplied filesystem type is supported for MQ data
+func SupportedFilesystem(fsType string) bool {
+ switch fsType {
case "aufs", "overlayfs", "tmpfs":
- return fmt.Errorf("%v uses unsupported filesystem type: %v", path, t)
+ return false
default:
- log.Printf("Detected %v has filesystem type '%v'", path, t)
- return nil
+ return true
}
}
diff --git a/cmd/runmqserver/mqconfig_other.go b/internal/containerruntime/runtime_other.go
similarity index 92%
rename from cmd/runmqserver/mqconfig_other.go
rename to internal/containerruntime/runtime_other.go
index 0c4c233..a46f0ff 100644
--- a/cmd/runmqserver/mqconfig_other.go
+++ b/internal/containerruntime/runtime_other.go
@@ -1,7 +1,7 @@
// +build !linux
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
-package main
+package runtime
// Dummy version of this function, only for non-Linux systems.
// Having this allows unit tests to be run on other platforms (e.g. macOS)
diff --git a/internal/keystore/keystore.go b/internal/keystore/keystore.go
index 2f4b759..26b6eea 100644
--- a/internal/keystore/keystore.go
+++ b/internal/keystore/keystore.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -68,11 +68,27 @@ func (ks *KeyStore) Create(log *logger.Logger) error {
stashFile := ks.Filename[0:len(ks.Filename)-len(extension)] + ".sth"
rdbFile := ks.Filename[0:len(ks.Filename)-len(extension)] + ".rdb"
crlFile := ks.Filename[0:len(ks.Filename)-len(extension)] + ".crl"
- os.Remove(stashFile)
- os.Remove(rdbFile)
- os.Remove(crlFile)
+ err = os.Remove(stashFile)
+ if err != nil {
+ log.Errorf("Error removing %s: %v", stashFile, err)
+ return err
+ }
+ err = os.Remove(rdbFile)
+ if err != nil {
+ log.Errorf("Error removing %s: %v", rdbFile, err)
+ return err
+ }
+ err = os.Remove(crlFile)
+ if err != nil {
+ log.Errorf("Error removing %s: %v", crlFile, err)
+ return err
+ }
+ }
+ err = os.Remove(ks.Filename)
+ if err != nil {
+ log.Errorf("Error removing %s: %v", ks.Filename, err)
+ return err
}
- os.Remove(ks.Filename)
} else if !os.IsNotExist(err) {
// If the keystore exists but cannot be accessed then return the error
return err
@@ -83,17 +99,6 @@ func (ks *KeyStore) Create(log *logger.Logger) error {
if err != nil {
return fmt.Errorf("error running \"%v -keydb -create\": %v %s", ks.command, err, out)
}
-
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(ks.Filename, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
return nil
}
@@ -112,16 +117,6 @@ func (ks *KeyStore) CreateStash(log *logger.Logger) error {
}
return err
}
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(stashFile, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
return nil
}
diff --git a/internal/logger/logger.go b/internal/logger/logger.go
index c2b2a5a..7278c98 100644
--- a/internal/logger/logger.go
+++ b/internal/logger/logger.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ type Logger struct {
pid string
serverName string
host string
- user *user.User
+ userName string
}
// NewLogger creates a new logger
@@ -53,9 +53,13 @@ func NewLogger(writer io.Writer, debug bool, json bool, serverName string) (*Log
if err != nil {
return nil, err
}
+ // This can fail because the container's running as a random UID which
+ // is not known by the OS. We don't want this to break the logging
+ // entirely, so just use a blank user name.
user, err := user.Current()
- if err != nil {
- return nil, err
+ userName := ""
+ if err == nil {
+ userName = user.Username
}
return &Logger{
mutex: sync.Mutex{},
@@ -66,7 +70,7 @@ func NewLogger(writer io.Writer, debug bool, json bool, serverName string) (*Log
pid: strconv.Itoa(os.Getpid()),
serverName: serverName,
host: hostname,
- user: user,
+ userName: userName,
}, nil
}
@@ -93,7 +97,7 @@ func (l *Logger) log(level string, msg string) {
"ibm_serverName": l.serverName,
"ibm_processName": l.processName,
"ibm_processId": l.pid,
- "ibm_userName": l.user.Username,
+ "ibm_userName": l.userName,
"type": "mq_containerlog",
}
s, err := l.format(entry)
diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go
index 7c0aaae..3e3a099 100644
--- a/internal/metrics/metrics.go
+++ b/internal/metrics/metrics.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ func GatherMetrics(qmName string, log *logger.Logger) {
err := startMetricsGathering(qmName, log)
if err != nil {
log.Errorf("Metrics Error: %s", err.Error())
- StopMetricsGathering()
+ StopMetricsGathering(log)
}
}
@@ -76,6 +76,7 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
http.Handle("/metrics", prometheus.Handler())
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
+ // #nosec G104
w.Write([]byte("Status: METRICS ACTIVE"))
})
@@ -83,7 +84,7 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
err = metricsServer.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
log.Errorf("Metrics Error: Failed to handle metrics request: %v", err)
- StopMetricsGathering()
+ StopMetricsGathering(log)
}
}()
@@ -91,7 +92,7 @@ func startMetricsGathering(qmName string, log *logger.Logger) error {
}
// StopMetricsGathering stops gathering metrics for the queue manager
-func StopMetricsGathering() {
+func StopMetricsGathering(log *logger.Logger) {
if metricsEnabled {
@@ -101,6 +102,9 @@ func StopMetricsGathering() {
// Shutdown HTTP server
timeout, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
- metricsServer.Shutdown(timeout)
+ err := metricsServer.Shutdown(timeout)
+ if err != nil {
+ log.Errorf("Failed to shutdown metrics server: %v", err)
+ }
}
}
diff --git a/internal/metrics/update.go b/internal/metrics/update.go
index 9aceceb..eb390f2 100644
--- a/internal/metrics/update.go
+++ b/internal/metrics/update.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -62,6 +62,7 @@ func processMetrics(log *logger.Logger, qmName string) {
firstConnect = false
startChannel <- true
}
+ // #nosec G104
metrics, _ = initialiseMetrics(log)
}
diff --git a/internal/mqtemplate/mqtemplate.go b/internal/mqtemplate/mqtemplate.go
index 28d80fc..e035b2c 100644
--- a/internal/mqtemplate/mqtemplate.go
+++ b/internal/mqtemplate/mqtemplate.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import (
"path"
"text/template"
- "github.com/ibm-messaging/mq-container/internal/command"
"github.com/ibm-messaging/mq-container/internal/logger"
)
@@ -38,13 +37,8 @@ func ProcessTemplateFile(templateFile, destFile string, data interface{}, log *l
_, err = os.Stat(dir)
if err != nil {
if os.IsNotExist(err) {
- os.MkdirAll(dir, 0660)
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(dir, mqmUID, mqmGID)
+ // #nosec G301
+ err = os.MkdirAll(dir, 0770)
if err != nil {
log.Error(err)
return err
@@ -53,6 +47,7 @@ func ProcessTemplateFile(templateFile, destFile string, data interface{}, log *l
return err
}
}
+ // #nosec G302
f, err := os.OpenFile(destFile, os.O_CREATE|os.O_WRONLY, 0660)
defer f.Close()
err = t.Execute(f, data)
@@ -60,15 +55,5 @@ func ProcessTemplateFile(templateFile, destFile string, data interface{}, log *l
log.Error(err)
return err
}
- mqmUID, mqmGID, err := command.LookupMQM()
- if err != nil {
- log.Error(err)
- return err
- }
- err = os.Chown(destFile, mqmUID, mqmGID)
- if err != nil {
- log.Error(err)
- return err
- }
return nil
}
diff --git a/internal/user/user.go b/internal/user/user.go
new file mode 100644
index 0000000..2a61aaf
--- /dev/null
+++ b/internal/user/user.go
@@ -0,0 +1,81 @@
+/*
+© Copyright IBM Corporation 2018, 2019
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package user
+
+import (
+ "fmt"
+ "os/user"
+ "strings"
+
+ "github.com/ibm-messaging/mq-container/internal/command"
+)
+
+// User holds information on primary and supplemental OS groups
+type User struct {
+ UID string
+ Name string
+ PrimaryGID string
+ SupplementalGID []string
+}
+
+// GetUser returns the current user and group information
+func GetUser() (User, error) {
+ u, err := user.Current()
+ if err != nil {
+ return User{}, err
+ }
+ g, err := getCurrentUserGroups()
+ if err != nil {
+ return User{}, err
+ }
+ if err != nil && len(g) == 0 {
+ return User{
+ UID: u.Uid,
+ Name: u.Name,
+ PrimaryGID: u.Gid,
+ SupplementalGID: []string{},
+ }, nil
+ }
+ // Look for the primary group in the list of group IDs
+ for i, v := range g {
+ if v == u.Gid {
+ // Remove the element from the slice
+ g = append(g[:i], g[i+1:]...)
+ }
+ }
+ return User{
+ UID: u.Uid,
+ Name: u.Name,
+ PrimaryGID: u.Gid,
+ SupplementalGID: g,
+ }, nil
+}
+
+func getCurrentUserGroups() ([]string, error) {
+ var nilArray []string
+ out, _, err := command.Run("id", "--groups")
+ if err != nil {
+ return nilArray, err
+ }
+
+ out = strings.TrimSpace(out)
+ if out == "" {
+ return nilArray, fmt.Errorf("Unable to determine groups for current user")
+ }
+
+ groups := strings.Split(out, " ")
+ return groups, nil
+}
diff --git a/manifests/dockerhub/manifest-9.yaml b/manifests/dockerhub/manifest-9.1.1.yaml
similarity index 85%
rename from manifests/dockerhub/manifest-9.yaml
rename to manifests/dockerhub/manifest-9.1.1.yaml
index 540b10c..95c154f 100644
--- a/manifests/dockerhub/manifest-9.yaml
+++ b/manifests/dockerhub/manifest-9.1.1.yaml
@@ -12,17 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-image: ibmcom/mq:9
+image: ibmcom/mq:9.1.1.0
manifests:
- - image: ibmcom/mq:9.1.0.0-x86_64
+ - image: ibmcom/mq:9.1.1.0-x86_64
platform:
architecture: amd64
os: linux
- - image: ibmcom/mq:9.1.0.0-ppc64le
+ - image: ibmcom/mq:9.1.1.0-ppc64le
platform:
architecture: ppc64le
os: linux
- - image: ibmcom/mq:9.1.0.0-s390x
+ - image: ibmcom/mq:9.1.1.0-s390x
platform:
architecture: s390x
os: linux
diff --git a/manifests/dockerhub/manifest-latest.yaml b/manifests/dockerhub/manifest-latest.yaml
index 051eac8..453184d 100644
--- a/manifests/dockerhub/manifest-latest.yaml
+++ b/manifests/dockerhub/manifest-latest.yaml
@@ -14,15 +14,15 @@
image: ibmcom/mq:latest
manifests:
- - image: ibmcom/mq:9.1.0.0-x86_64
+ - image: ibmcom/mq:9.1.1.0-x86_64
platform:
architecture: amd64
os: linux
- - image: ibmcom/mq:9.1.0.0-ppc64le
+ - image: ibmcom/mq:9.1.1.0-ppc64le
platform:
architecture: ppc64le
os: linux
- - image: ibmcom/mq:9.1.0.0-s390x
+ - image: ibmcom/mq:9.1.1.0-s390x
platform:
architecture: s390x
os: linux
diff --git a/manifests/dockerstore/manifest-9.1.1.yaml b/manifests/dockerstore/manifest-9.1.1.yaml
new file mode 100644
index 0000000..9c79f70
--- /dev/null
+++ b/manifests/dockerstore/manifest-9.1.1.yaml
@@ -0,0 +1,29 @@
+# © Copyright IBM Corporation 2018
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+image: ibmcorp/mqadvanced-server-dev:9.1.1.0
+manifests:
+ - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-x86_64
+ platform:
+ architecture: amd64
+ os: linux
+ - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-ppc64le
+ platform:
+ architecture: ppc64le
+ os: linux
+ - image: ibmcorp/mqadvanced-server-dev:9.1.1.0-s390x
+ platform:
+ architecture: s390x
+ os: linux
+
diff --git a/mq-advanced-server-rhel/README.md b/mq-advanced-server-rhel/README.md
index c446168..ad6e438 100644
--- a/mq-advanced-server-rhel/README.md
+++ b/mq-advanced-server-rhel/README.md
@@ -1,7 +1,3 @@
-This is a work-in-progress for a Docker image based on Red Hat Enterprise Linux (RHEL).
+# RHEL-based container build
-The current MQ container build requires Docker V17.05 or greater (required features include multi-stage Docker build, and "ARG"s in the "FROM" statement). Red Hat Enterprise Linux V7.5 includes Docker up to version V1.13.
-
-In order to build images with Red Hat Enterprise Linux, license registration is required. The license of the host server can be used, as long as you either use Red Hat's patched version of Docker (which is an old version), or if you use alternative container management tools such as [`buildah`](https://github.com/projectatomic/buildah/) and `podman` (from [`libpod`](https://github.com/projectatomic/libpod)).
-
-This directory contains scripts for building with `buildah`. The build itself isn't containerized, so more software than usual is needed on the RHEL host, so an Ansible playbook is also provided to help set up the host.
\ No newline at end of file
+Build scripts for building a container image based on Red Hat Enterprise Linux (RHEL), using the [`buildah`](https://github.com/containers/buildah) tool. buildah is supported on RHEL V7.5 and greater.
\ No newline at end of file
diff --git a/mq-advanced-server-rhel/go-build.sh b/mq-advanced-server-rhel/go-build.sh
index 831ba41..eeb17f8 100755
--- a/mq-advanced-server-rhel/go-build.sh
+++ b/mq-advanced-server-rhel/go-build.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");
@@ -17,9 +17,11 @@
# Builds and tests the golang programs used by the MQ image.
-set -e
+set -ex
-cd $GOPATH/src/github.com/ibm-messaging/mq-container/
+# Handle a GOPATH with multiple entries (just choose the first one)
+IFS=':' read -ra DIR <<< "$GOPATH"
+cd ${DIR[0]}/src/github.com/ibm-messaging/mq-container/
# Build and test the Go code
mkdir -p build
diff --git a/mq-advanced-server-rhel/go-buildah.sh b/mq-advanced-server-rhel/go-buildah.sh
index e5d25f8..bdf36d5 100755
--- a/mq-advanced-server-rhel/go-buildah.sh
+++ b/mq-advanced-server-rhel/go-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");
@@ -18,18 +18,32 @@
# Run the Go build script inside the Go container, mounting the source
# directory in
+function usage {
+ echo "Usage: $0 TAG DevModeFlag"
+ exit 20
+}
+
+if [ "$#" -ne 2 ]; then
+ echo "ERROR: Invalid number of parameters"
+ usage
+fi
+
readonly tag=$1
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
+# Note the "podman" network is used explicitly, to avoid problems other CNI networks (e.g. on an OpenShift node)
podman run \
- --volume ${PWD}:/go/src/github.com/ibm-messaging/mq-container/ \
- --env GOPATH=/go \
+ --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} \
+ --user $(id -u) \
--rm \
+ --network podman \
${tag} \
- bash -c "cd /go/src/github.com/ibm-messaging/mq-container/ && ./mq-advanced-server-rhel/go-build.sh"
+ 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/install-mq-rhel.sh b/mq-advanced-server-rhel/install-mq-rhel.sh
index 59cfc5f..36dd7a7 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");
@@ -19,11 +19,23 @@
set -ex
+function usage {
+ echo "Usage: $0 MQContainer MountLocation ARCHIVENAME PACKAGES"
+ exit 20
+}
+
+if [ "$#" -ne 4 ]; then
+ echo "ERROR: Invalid number of parameters"
+ usage
+fi
+
readonly ctr_mq=$1
readonly mnt_mq=$2
readonly archive=$3
readonly mq_packages=$4
readonly dir_extract=/tmp/extract
+readonly mqm_uid=888
+readonly mqm_gid=888
if [ ! -d ${dir_extract}/MQServer ]; then
mkdir -p ${dir_extract}
@@ -32,13 +44,11 @@ if [ ! -d ${dir_extract}/MQServer ]; then
echo Extracting finished
fi
-# If MQ_PACKAGES isn't specifically set, then choose a valid set of defaults
-
-
# 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
@@ -52,16 +62,23 @@ find $mnt_mq/opt/mqm -name '*.tar.gz' -delete
buildah run $ctr_mq -- /opt/mqm/bin/setmqinst -p /opt/mqm -i
mkdir -p $mnt_mq/run/runmqserver
-chown 888:888 $mnt_mq/run/runmqserver
+chown ${mqm_uid}:${mqm_gid} $mnt_mq/run/runmqserver
# Remove the directory structure under /var/mqm which was created by the installer
rm -rf $mnt_mq/var/mqm
-# Create the mount point for volumes
+# Create the mount point for volumes, ensuring MQ has permissions to all directories
mkdir -p $mnt_mq/mnt/mqm
+install --directory --mode 0775 --owner ${mqm_uid} --group root $mnt_mq/mnt
+install --directory --mode 0775 --owner ${mqm_uid} --group root $mnt_mq/mnt/mqm
+install --directory --mode 0775 --owner ${mqm_uid} --group root $mnt_mq/mnt/mqm/data
+
+# Create the directory for MQ configuration files
+mkdir -p /etc/mqm
+install --directory --mode 0775 --owner ${mqm_uid} --group root $mnt_mq/etc/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 d16d351..a6c4f2d 100755
--- a/mq-advanced-server-rhel/mq-buildah.sh
+++ b/mq-advanced-server-rhel/mq-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");
@@ -16,35 +16,62 @@
# limitations under the License.
# Build a RHEL image, using the buildah tool
-# Usage
-# mq-buildah.sh ARCHIVEFILE PACKAGES
set -x
set -e
+function usage {
+ echo "Usage: $0 ARCHIVE-NAME PACKAGES TAG VERSION MQDevFlag"
+ exit 20
+}
+
+if [ "$#" -ne 5 ]; then
+ echo "ERROR: Invalid number of parameters"
+ usage
+fi
+
###############################################################################
# Setup MQ server working container
###############################################################################
-readonly ctr_mq=$(buildah from rhel7)
+# Use RHEL 7 minimal container (which doesn't include things like Python or Yum)
+readonly ctr_mq=$(buildah from rhel7-minimal)
+if [ -z "$ctr_mq" ]
+then
+ echo "ERROR: ctr_mq is empty. Check above output for errors"
+ exit 50
+fi
+
readonly mnt_mq=$(buildah mount $ctr_mq)
+if [ -z "$mnt_mq" ]
+then
+ echo "ERROR: mnt_mq is empty. Check above output for errors"
+ exit 50
+fi
+
readonly archive=downloads/$1
readonly packages=$2
readonly tag=$3
readonly version=$4
readonly mqdev=$5
+readonly mqm_uid=888
+readonly mqm_gid=888
###############################################################################
# Install MQ server
###############################################################################
-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
-
-# Install the packages required by MQ
-buildah run $ctr_mq -- yum install -y --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
+if subscription-manager status ; then
+ # Host is subscribed, but the minimal image has no enabled repos
+ # 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/
+fi
+buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \
bash \
bc \
coreutils \
@@ -56,25 +83,47 @@ buildah run $ctr_mq -- yum install -y --setopt install_weak_deps=false --setopt=
passwd \
procps-ng \
sed \
+ shadow-utils \
tar \
util-linux \
- openssl
+ openssl \
+ which
+
+# Install "sudo" if using MQ Advanced for Developers
+if [ "$mqdev" = "TRUE" ]; then
+ buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install sudo
+fi
# Clean up cached files
-buildah run $ctr_mq -- yum clean all
-rm -rf ${mnt_mq}/var/cache/yum/*
+buildah run ${ctr_mq} -- microdnf ${microdnf_opts} clean all
+rm -rf ${mnt_mq}/etc/yum.repos.d/*
+
+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 --groups 0 mqm
# Install MQ server packages into the MQ builder image
./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${archive}" "${packages}"
# 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 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
+
+install --directory --mode 0775 --owner ${mqm_uid} --group 0 ${mnt_mq}/run/runmqserver
+buildah run --user root $ctr_mq -- touch /run/termination-log
+buildah run --user root $ctr_mq -- chown mqm:root /run/termination-log
+buildah run --user root $ctr_mq -- chmod 0660 /run/termination-log
+
+# Copy in licenses from installed packages
+install --mode 0550 --owner root --group root ./mq-advanced-server-rhel/writePackages.sh ${mnt_mq}/usr/local/bin/writePackages
+buildah run --user root $ctr_mq -- /usr/local/bin/writePackages
+
+# Copy web XML files
+cp -R web ${mnt_mq}/etc/mqm/web
# Copy web XML files
cp -R web ${mnt_mq}/etc/mqm/web
@@ -86,9 +135,11 @@ cp -R web ${mnt_mq}/etc/mqm/web
if [ "$mqdev" = "TRUE" ]; then
OSTAG="mq messaging developer"
DISNAME="IBM MQ Advanced Server Developer Edition"
+ PID="98102d16795c4263ad9ca075190a2d4d"
else
OSTAG="mq messaging"
DISNAME="IBM MQ Advanced Server"
+ PID="4486e8c4cc9146fd9b3ce1f14a2dfc5b"
fi
buildah config \
@@ -107,11 +158,14 @@ buildah config \
--label run="docker run -d -e LICENSE=accept --name ibm-mq ${tag%:*}" \
--label summary="$DISNAME" \
--label description="IBM MQ is messaging middleware that simplifies and accelerates the integration of diverse applications and business data across multiple platforms. It uses message queues to facilitate the exchanges of information and offers a single messaging solution for cloud, mobile, Internet of Things (IoT) and on-premises environments." \
+ --label IBM_PRODUCT_ID="$PID" \
+ --label IBM_PRODUCT_NAME="$DISNAME" \
+ --label IBM_PRODUCT_VERSION="$version" \
--env AMQ_ADDITIONAL_JSON_LOG=1 \
--env LANG=en_US.UTF-8 \
--env LOG_FORMAT=basic \
--entrypoint runmqserver \
- --user root \
+ --user ${mqm_uid} \
$ctr_mq
buildah unmount $ctr_mq
buildah commit $ctr_mq $tag
diff --git a/mq-advanced-server-rhel/mq-golang-sdk-buildah.sh b/mq-advanced-server-rhel/mq-golang-sdk-buildah.sh
index 60add5a..fbca330 100755
--- a/mq-advanced-server-rhel/mq-golang-sdk-buildah.sh
+++ b/mq-advanced-server-rhel/mq-golang-sdk-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");
@@ -18,30 +18,41 @@
# Build a RHEL image for building Go programs which use MQ
set -ex
-readonly mq_archive=downloads/$1
+
+function usage {
+ echo "Usage: $0 REDIST-ARCHIVE-NAME TAG"
+ exit 20
+}
+
+if [ "$#" -ne 2 ]; then
+ echo "ERROR: Invalid number of parameters"
+ usage
+fi
+
+readonly mq_redist_archive=downloads/$1
readonly tag=$2
-# Use plain RHEL 7 container
-# Note: Red Hat's devtools/go-toolset-7-rhel7 image doesn't allow use of 'root'
-# user required for installing the MQ SDK
-readonly ctr_mq=$(buildah from rhel7)
-readonly mnt_mq=$(buildah mount $ctr_mq)
+# Use Red Hat's Go toolset image as the base
+readonly ctr_mq=$(buildah from devtools/go-toolset-7-rhel7)
+if [ -z "$ctr_mq" ]
+then
+ echo "ERROR: ctr_mq is empty. Check above output for errors"
+ exit 50
+fi
-# Add mqm user
-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
+readonly mnt_mq_go=$(buildah mount $ctr_mq)
+if [ -z "$mnt_mq_go" ]
+then
+ echo "ERROR: mnt_mq_go is empty. Check above output for errors"
+ exit 50
+fi
-# Enable Yum repository for "optional" RPMs, which is needed for "golang"
-buildah run ${ctr_mq} -- yum-config-manager --enable rhel-7-server-optional-rpms
-# Install Go compiler
-buildah run ${ctr_mq} -- yum install -y golang git gcc
+# Install the MQ redistributable client (including header files) into the Go builder image
+mkdir -p ${mnt_mq_go}/opt/mqm
+tar -xzf ${mq_redist_archive} -C ${mnt_mq_go}/opt/mqm
-# Install the MQ SDK into the Go builder image
-./mq-advanced-server-rhel/install-mq-rhel.sh ${ctr_mq} "${mnt_mq}" "${mq_archive}" "MQSeriesRuntime-*.rpm MQSeriesSDK-*.rpm MQSeriesSamples*.rpm"
# Clean up Yum files
-buildah run ${ctr_mq} -- yum clean all --releasever 7
-rm -rf ${mnt_mq}/var/cache/yum/*
+rm -rf ${mnt_mq_go}/etc/yum.repos.d/*
+
buildah unmount ${ctr_mq}
# Set environment variables for MQ/Go compilation
buildah config \
diff --git a/mq-advanced-server-rhel/mqdev-buildah.sh b/mq-advanced-server-rhel/mqdev-buildah.sh
index 1d29fbe..5778ec9 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");
@@ -15,13 +15,21 @@
# 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
+function usage {
+ echo "Usage: $0 BASETAG TAG VERSION"
+ exit 20
+}
+
+if [ "$#" -ne 3 ]; then
+ echo "ERROR: Invalid number of parameters"
+ usage
+fi
+
###############################################################################
# Setup MQ server working container
###############################################################################
@@ -30,26 +38,44 @@ set -e
# Resulting image won't have yum, for example
readonly basetag=$1
readonly ctr_mq=$(buildah from $basetag)
+if [ -z "$ctr_mq" ]
+then
+ echo "ERROR: ctr_mq is empty. Check above output for errors"
+ exit 50
+fi
+
readonly mnt_mq=$(buildah mount $ctr_mq)
+if [ -z "$mnt_mq" ]
+then
+ echo "ERROR: mnt_mq is empty. Check above output for errors"
+ exit 50
+fi
+
readonly tag=$2
readonly version=$3
+readonly mqm_uid=888
+readonly mqm_gid=888
+# WARNING: This is what allows the mqm user to change the password of any other user
+# It's used by runmqdevserver to change the admin/app passwords.
+echo "mqm ALL = NOPASSWD: /usr/sbin/chpasswd" > $mnt_mq/etc/sudoers.d/mq-dev-config
-useradd --root $mnt_mq --gid mqm admin
-groupadd --root $mnt_mq --system mqclient
-useradd --root $mnt_mq --gid mqclient app
+# 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"
-buildah run $ctr_mq -- id admin
-buildah run $ctr_mq -- sh -c "echo admin:passw0rd | chpasswd"
-
-mkdir -p $mnt_mq/run/runmqdevserver
-chown 888:888 $mnt_mq/run/runmqdevserver
+mkdir --parents $mnt_mq/run/runmqdevserver
+chown ${mqm_uid}:${mqm_gid} $mnt_mq/run/runmqdevserver
# Copy runmqdevserver program
-install --mode 0750 --owner 888 --group 888 ./build/runmqdevserver ${mnt_mq}/usr/local/bin/
+install --mode 0750 --owner ${mqm_uid} --group ${mqm_gid} ./build/runmqdevserver ${mnt_mq}/usr/local/bin/
+
+install --directory --mode 0775 --owner ${mqm_uid} --group 0 ${mnt_mq}/run/runmqdevserver
# Copy template files
-cp incubating/mqadvanced-server-dev/*.tpl ${mnt_mq}/etc/mqm/
+cp ./incubating/mqadvanced-server-dev/*.tpl ${mnt_mq}/etc/mqm/
# Copy web XML files for default developer configuration
cp -R incubating/mqadvanced-server-dev/web/ ${mnt_mq}/etc/mqm/web
@@ -74,13 +100,16 @@ buildah config \
--label run="docker run -d -e LICENSE=accept --name ibm-mq-dev ${tag%:*}" \
--label summary="IBM MQ Advanced Server Developer Edition" \
--label description="IBM MQ is messaging middleware that simplifies and accelerates the integration of diverse applications and business data across multiple platforms. It uses message queues to facilitate the exchanges of information and offers a single messaging solution for cloud, mobile, Internet of Things (IoT) and on-premises environments." \
+ --label IBM_PRODUCT_ID="98102d16795c4263ad9ca075190a2d4d" \
+ --label IBM_PRODUCT_NAME="IBM MQ Advanced Server Developer Edition" \
+ --label IBM_PRODUCT_VERSION="$version" \
--env AMQ_ADDITIONAL_JSON_LOG=1 \
--env LANG=en_US.UTF-8 \
--env LOG_FORMAT=basic \
--env MQ_ADMIN_PASSWORD=passw0rd \
--env MQ_DEV=true \
--entrypoint runmqdevserver \
- --user root \
+ --user ${mqm_uid} \
$ctr_mq
buildah unmount $ctr_mq
buildah commit $ctr_mq $tag
diff --git a/mq-advanced-server-rhel/writePackages.sh b/mq-advanced-server-rhel/writePackages.sh
new file mode 100755
index 0000000..91ce8f7
--- /dev/null
+++ b/mq-advanced-server-rhel/writePackages.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# -*- mode: sh -*-
+# © Copyright IBM Corporation 2018, 2019
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Copy in licenses from installed packages
+
+set -e
+
+rm -f /licenses/installed_package_notices
+
+for p in $(rpm -qa | sort)
+do
+ rpm -qi $p >> /licenses/installed_package_notices
+ printf "\n" >> /licenses/installed_package_notices
+done
+
+chmod 0444 /licenses/installed_package_notices
diff --git a/test/docker/Gopkg.toml b/test/docker/Gopkg.toml
index c29f50e..056e2d2 100644
--- a/test/docker/Gopkg.toml
+++ b/test/docker/Gopkg.toml
@@ -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.
@@ -18,7 +18,7 @@
[[constraint]]
name = "github.com/docker/go-connections"
- version = "0.3.0"
+ version = "0.4.0"
[prune]
go-tests = true
diff --git a/test/docker/devconfig_test.go b/test/docker/devconfig_test.go
index 711e9ee..68122da 100644
--- a/test/docker/devconfig_test.go
+++ b/test/docker/devconfig_test.go
@@ -33,6 +33,7 @@ import (
// Note: This test requires a separate container image to be available for the JMS tests.
func TestDevGoldenPath(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -66,6 +67,7 @@ func TestDevGoldenPath(t *testing.T) {
// Note: This test requires a separate container image to be available for the JMS tests
func TestDevSecure(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -127,6 +129,7 @@ func TestDevSecure(t *testing.T) {
func TestDevWebDisabled(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -157,6 +160,7 @@ func TestDevWebDisabled(t *testing.T) {
func TestDevConfigDisabled(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
diff --git a/test/docker/devconfig_test_util.go b/test/docker/devconfig_test_util.go
index 77afe15..f202d38 100644
--- a/test/docker/devconfig_test_util.go
+++ b/test/docker/devconfig_test_util.go
@@ -1,7 +1,7 @@
// +build mqdev
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -114,7 +114,7 @@ func runJMSTests(t *testing.T, cli *client.Client, ID string, tls bool, user, pa
t.Fatal(err)
}
startContainer(t, cli, ctr.ID)
- rc := waitForContainer(t, cli, ctr.ID, 10)
+ rc := waitForContainer(t, cli, ctr.ID, 2*time.Minute)
if rc != 0 {
t.Errorf("JUnit container failed with rc=%v", rc)
}
diff --git a/test/docker/docker_api_test.go b/test/docker/docker_api_test.go
index aaa26e2..37759f2 100644
--- a/test/docker/docker_api_test.go
+++ b/test/docker/docker_api_test.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -34,10 +34,13 @@ import (
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
+
+ "github.com/ibm-messaging/mq-container/internal/command"
)
func TestLicenseNotSet(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -45,15 +48,16 @@ func TestLicenseNotSet(t *testing.T) {
containerConfig := container.Config{}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
- rc := waitForContainer(t, cli, id, 5)
+ rc := waitForContainer(t, cli, id, 20*time.Second)
if rc != 1 {
t.Errorf("Expected rc=1, got rc=%v", rc)
}
- expectTerminationMessage(t)
+ expectTerminationMessage(t, cli, id)
}
func TestLicenseView(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -63,7 +67,7 @@ func TestLicenseView(t *testing.T) {
}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
- rc := waitForContainer(t, cli, id, 5)
+ rc := waitForContainer(t, cli, id, 20*time.Second)
if rc != 1 {
t.Errorf("Expected rc=1, got rc=%v", rc)
}
@@ -77,12 +81,14 @@ func TestLicenseView(t *testing.T) {
// TestGoldenPath starts a queue manager successfully when metrics are enabled
func TestGoldenPathWithMetrics(t *testing.T) {
t.Parallel()
+
goldenPath(t, true)
}
// TestGoldenPath starts a queue manager successfully when metrics are disabled
func TestGoldenPathNoMetrics(t *testing.T) {
t.Parallel()
+
goldenPath(t, false)
}
@@ -106,10 +112,11 @@ func goldenPath(t *testing.T, metric bool) {
stopContainer(t, cli, id)
}
-// TestSecurityVulnerabilities checks for any vulnerabilities in the image, as reported
+// TestSecurityVulnerabilitiesUbuntu checks for any vulnerabilities in the image, as reported
// by Ubuntu
-func TestSecurityVulnerabilities(t *testing.T) {
+func TestSecurityVulnerabilitiesUbuntu(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -135,6 +142,47 @@ func TestSecurityVulnerabilities(t *testing.T) {
}
}
+// TestSecurityVulnerabilitiesRedHat checks for any vulnerabilities in the image, as reported
+// by Red Hat
+func TestSecurityVulnerabilitiesRedHat(t *testing.T) {
+ t.Parallel()
+
+ cli, err := client.NewEnvClient()
+ if err != nil {
+ t.Fatal(err)
+ }
+ _, ret, _ := command.Run("bash", "-c", "test -f /etc/redhat-release")
+ if ret != 0 {
+ t.Skip("Skipping test because host is not RedHat-based")
+ }
+ rc, _ := runContainerOneShot(t, cli, "bash", "-c", "test -f /etc/redhat-release")
+ if rc != 0 {
+ t.Skip("Skipping test because container is not RedHat-based")
+ }
+ id, _, err := command.Run("sudo", "buildah", "from", imageName())
+ if err != nil {
+ t.Log(id)
+ t.Fatal(err)
+ }
+ id = strings.TrimSpace(id)
+ defer command.Run("buildah", "rm", id)
+ mnt, _, err := command.Run("sudo", "buildah", "mount", id)
+ if err != nil {
+ t.Log(mnt)
+ t.Fatal(err)
+ }
+ mnt = strings.TrimSpace(mnt)
+ out, _, err := command.Run("bash", "-c", "sudo cp /etc/yum.repos.d/* "+filepath.Join(mnt, "/etc/yum.repos.d/"))
+ if err != nil {
+ t.Log(out)
+ t.Fatal(err)
+ }
+ out, ret, _ = command.Run("bash", "-c", "yum --installroot="+mnt+" updateinfo list sec | grep /Sec")
+ if ret != 1 {
+ t.Errorf("Expected no vulnerabilities, found the following:\n%v", out)
+ }
+}
+
func utilTestNoQueueManagerName(t *testing.T, hostName string, expectedName string) {
search := "QMNAME(" + expectedName + ")"
cli, err := client.NewEnvClient()
@@ -155,11 +203,13 @@ func utilTestNoQueueManagerName(t *testing.T, hostName string, expectedName stri
}
func TestNoQueueManagerName(t *testing.T) {
t.Parallel()
+
utilTestNoQueueManagerName(t, "test", "test")
}
func TestNoQueueManagerNameInvalidHostname(t *testing.T) {
t.Parallel()
+
utilTestNoQueueManagerName(t, "test-1", "test1")
}
@@ -167,6 +217,7 @@ func TestNoQueueManagerNameInvalidHostname(t *testing.T) {
// container and starts a new one with same volume. With metrics enabled
func TestWithVolumeAndMetrics(t *testing.T) {
t.Parallel()
+
withVolume(t, true)
}
@@ -174,6 +225,7 @@ func TestWithVolumeAndMetrics(t *testing.T) {
// container and starts a new one with same volume. With metrics disabled
func TestWithVolumeNoMetrics(t *testing.T) {
t.Parallel()
+
withVolume(t, false)
}
@@ -225,6 +277,7 @@ func withVolume(t *testing.T, metric bool) {
// and restarted cleanly
func TestNoVolumeWithRestart(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -240,58 +293,139 @@ func TestNoVolumeWithRestart(t *testing.T) {
waitForReady(t, cli, id)
}
-// TestCreateQueueManagerFail causes a failure of `crtmqm`
-func TestCreateQueueManagerFail(t *testing.T) {
- t.Parallel()
+// TestVolumeRequiresRoot tests the case where only the root user can write
+// to the persistent volume. In this case, an "init container" is needed,
+// where `runmqserver -i` is run to initialize the storage. Then the
+// container can be run as normal.
+func TestVolumeRequiresRoot(t *testing.T) {
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
}
- img, _, err := cli.ImageInspectWithRaw(context.Background(), imageName())
+ vol := createVolume(t, cli)
+ defer removeVolume(t, cli, vol.Name)
+
+ // Set permissions on the volume to only allow root to write it
+ // It's important that read and execute permissions are given to other users
+ rc, _ := runContainerOneShotWithVolume(t, cli, vol.Name+":/mnt/mqm:nocopy", "bash", "-c", "chown 65534:4294967294 /mnt/mqm/ && chmod 0755 /mnt/mqm/ && ls -lan /mnt/mqm/")
+ if rc != 0 {
+ t.Errorf("Expected one shot container to return rc=0, got rc=%v", rc)
+ }
+
+ containerConfig := container.Config{
+ Image: imageName(),
+ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"},
+ }
+ hostConfig := container.HostConfig{
+ Binds: []string{
+ coverageBind(t),
+ vol.Name + ":/mnt/mqm:nocopy",
+ },
+ }
+ networkingConfig := network.NetworkingConfig{}
+
+ // Run an "init container" as root, with the "-i" option, to initialize the volume
+ containerConfig = container.Config{
+ Image: imageName(),
+ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1", "DEBUG=true"},
+ User: "0",
+ Entrypoint: []string{"runmqserver", "-i"},
+ }
+ initCtr, err := cli.ContainerCreate(context.Background(), &containerConfig, &hostConfig, &networkingConfig, t.Name()+"Init")
if err != nil {
t.Fatal(err)
}
- oldEntrypoint := strings.Join(img.Config.Entrypoint, " ")
+ defer cleanContainer(t, cli, initCtr.ID)
+ t.Logf("Init container ID=%v", initCtr.ID)
+ startContainer(t, cli, initCtr.ID)
+ rc = waitForContainer(t, cli, initCtr.ID, 20*time.Second)
+ if rc != 0 {
+ t.Errorf("Expected init container to exit with rc=0, got rc=%v", rc)
+ }
+
+ containerConfig = container.Config{
+ Image: imageName(),
+ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1", "DEBUG=true"},
+ }
+ ctr, err := cli.ContainerCreate(context.Background(), &containerConfig, &hostConfig, &networkingConfig, t.Name()+"Main")
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer cleanContainer(t, cli, ctr.ID)
+ t.Logf("Main container ID=%v", ctr.ID)
+ startContainer(t, cli, ctr.ID)
+ waitForReady(t, cli, ctr.ID)
+}
+
+// TestCreateQueueManagerFail causes a failure of `crtmqm`
+func TestCreateQueueManagerFail(t *testing.T) {
+ t.Parallel()
+
+ cli, err := client.NewEnvClient()
+ if err != nil {
+ t.Fatal(err)
+ }
+ var files = []struct {
+ Name, Body string
+ }{
+ {"Dockerfile", fmt.Sprintf(`
+ FROM %v
+ USER root
+ RUN echo '#!/bin/bash\nexit 999' > /opt/mqm/bin/crtmqm
+ RUN chown mqm:mqm /opt/mqm/bin/crtmqm
+ RUN chmod 6550 /opt/mqm/bin/crtmqm
+ USER mqm`, imageName())},
+ }
+ tag := createImage(t, cli, files)
+ defer deleteImage(t, cli, tag)
+
containerConfig := container.Config{
- Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"},
- // Override the entrypoint to create the queue manager directory, but leave it empty.
- // This will cause `crtmqm` to return with an exit code of 2.
- Entrypoint: []string{"bash", "-c", "mkdir -p /mnt/mqm/data && mkdir -p /var/mqm/qmgrs/qm1 && exec " + oldEntrypoint},
+ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"},
+ Image: tag,
}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
- rc := waitForContainer(t, cli, id, 10)
+ rc := waitForContainer(t, cli, id, 10*time.Second)
if rc != 1 {
t.Errorf("Expected rc=1, got rc=%v", rc)
}
- expectTerminationMessage(t)
+ expectTerminationMessage(t, cli, id)
}
// TestStartQueueManagerFail causes a failure of `strmqm`
func TestStartQueueManagerFail(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
}
- img, _, err := cli.ImageInspectWithRaw(context.Background(), imageName())
- if err != nil {
- t.Fatal(err)
+ var files = []struct {
+ Name, Body string
+ }{
+ {"Dockerfile", fmt.Sprintf(`
+ FROM %v
+ USER root
+ RUN echo '#!/bin/bash\ndltmqm $@ && strmqm $@' > /opt/mqm/bin/strmqm
+ RUN chown mqm:mqm /opt/mqm/bin/strmqm
+ RUN chmod 6550 /opt/mqm/bin/strmqm
+ USER mqm`, imageName())},
}
- oldEntrypoint := strings.Join(img.Config.Entrypoint, " ")
+ tag := createImage(t, cli, files)
+ defer deleteImage(t, cli, tag)
+
containerConfig := container.Config{
- Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1", "DEBUG=1"},
- // Override the entrypoint to replace `strmqm` with a script which deletes the queue manager.
- // This will cause `strmqm` to return with an exit code of 72.
- Entrypoint: []string{"bash", "-c", "echo '#!/bin/bash\ndltmqm $@ && strmqm $@' > /opt/mqm/bin/strmqm && exec " + oldEntrypoint},
+ Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"},
+ Image: tag,
}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
- rc := waitForContainer(t, cli, id, 10)
+ rc := waitForContainer(t, cli, id, 20*time.Second)
if rc != 1 {
t.Errorf("Expected rc=1, got rc=%v", rc)
}
- expectTerminationMessage(t)
+ expectTerminationMessage(t, cli, id)
}
// TestVolumeUnmount runs a queue manager with a volume, and then forces an
@@ -300,6 +434,7 @@ func TestStartQueueManagerFail(t *testing.T) {
// attached storage gets unmounted.
func TestVolumeUnmount(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -348,6 +483,7 @@ func TestVolumeUnmount(t *testing.T) {
// created, then checks that no zombies exist (runmqserver should reap them)
func TestZombies(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -384,6 +520,7 @@ func TestZombies(t *testing.T) {
// on that image, and checks that the MQSC has been applied correctly.
func TestMQSC(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -391,7 +528,13 @@ func TestMQSC(t *testing.T) {
var files = []struct {
Name, Body string
}{
- {"Dockerfile", fmt.Sprintf("FROM %v\nRUN rm -f /etc/mqm/*.mqsc\nADD test.mqsc /etc/mqm/", imageName())},
+ {"Dockerfile", fmt.Sprintf(`
+ FROM %v
+ USER root
+ RUN rm -f /etc/mqm/*.mqsc
+ ADD test.mqsc /etc/mqm/
+ RUN chmod 0660 /etc/mqm/test.mqsc
+ USER mqm`, imageName())},
{"test.mqsc", "DEFINE QLOCAL(test)"},
}
tag := createImage(t, cli, files)
@@ -411,11 +554,48 @@ func TestMQSC(t *testing.T) {
}
}
+// TestInvalidMQSC creates a new image with an MQSC file containing invalid MQSC,
+// tries to start a container based on that image, and checks that container terminates
+// func TestInvalidMQSC(t *testing.T) {
+// t.Parallel()
+// cli, err := client.NewEnvClient()
+// if err != nil {
+// t.Fatal(err)
+// }
+// var files = []struct {
+// Name, Body string
+// }{
+// {"Dockerfile", fmt.Sprintf(`
+// FROM %v
+// USER root
+// RUN rm -f /etc/mqm/*.mqsc
+// ADD mqscTest.mqsc /etc/mqm/
+// RUN chmod 0660 /etc/mqm/mqscTest.mqsc
+// USER mqm`, imageName())},
+// {"mqscTest.mqsc", "DEFINE INVALIDLISTENER('TEST.LISTENER.TCP') TRPTYPE(TCP) PORT(1414) CONTROL(QMGR) REPLACE"},
+// }
+// tag := createImage(t, cli, files)
+// defer deleteImage(t, cli, tag)
+
+// containerConfig := container.Config{
+// Env: []string{"LICENSE=accept", "MQ_QMGR_NAME=qm1"},
+// Image: tag,
+// }
+// id := runContainer(t, cli, &containerConfig)
+// defer cleanContainer(t, cli, id)
+// rc := waitForContainer(t, cli, id, 60*time.Second)
+// if rc != 1 {
+// t.Errorf("Expected rc=1, got rc=%v", rc)
+// }
+// expectTerminationMessage(t, cli, id)
+// }
+
// TestReadiness creates a new image with large amounts of MQSC in, to
// ensure that the readiness check doesn't pass until configuration has finished.
// WARNING: This test is sensitive to the speed of the machine it's running on.
func TestReadiness(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -428,7 +608,13 @@ func TestReadiness(t *testing.T) {
var files = []struct {
Name, Body string
}{
- {"Dockerfile", fmt.Sprintf("FROM %v\nRUN rm -f /etc/mqm/*.mqsc\nADD test.mqsc /etc/mqm/", imageName())},
+ {"Dockerfile", fmt.Sprintf(`
+ FROM %v
+ USER root
+ RUN rm -f /etc/mqm/*.mqsc
+ ADD test.mqsc /etc/mqm/
+ RUN chmod 0660 /etc/mqm/test.mqsc
+ USER mqm`, imageName())},
{"test.mqsc", buf.String()},
}
tag := createImage(t, cli, files)
@@ -464,22 +650,34 @@ func TestReadiness(t *testing.T) {
func TestErrorLogRotation(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
}
+
+ logsize := 65536
+
+ rc, _ := runContainerOneShot(t, cli, "bash", "-c", "test -d /etc/apt")
+ if rc != 0 {
+ // RHEL
+ logsize = 32768
+ }
+
qmName := "qm1"
containerConfig := container.Config{
Env: []string{
"LICENSE=accept",
"MQ_QMGR_NAME=" + qmName,
- "MQMAXERRORLOGSIZE=65536",
+ fmt.Sprintf("MQMAXERRORLOGSIZE=%d", logsize),
"LOG_FORMAT=json",
+ fmt.Sprintf("AMQ_EXTRA_QM_STANZAS=QMErrorLog:ErrorLogSize=%d", logsize),
},
ExposedPorts: nat.PortSet{
"1414/tcp": struct{}{},
},
}
+
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
waitForReady(t, cli, id)
@@ -487,6 +685,7 @@ func TestErrorLogRotation(t *testing.T) {
// Generate some content for the error logs, by trying to put messages under an unauthorized user
// execContainer(t, cli, id, "fred", []string{"bash", "-c", "for i in {1..30} ; do /opt/mqm/samp/bin/amqsput FAKE; done"})
execContainer(t, cli, id, "root", []string{"useradd", "fred"})
+
for {
execContainer(t, cli, id, "fred", []string{"bash", "-c", "/opt/mqm/samp/bin/amqsput FAKE"})
@@ -529,12 +728,14 @@ func TestErrorLogRotation(t *testing.T) {
// Tests the log comes out in JSON format when JSON format is enabled. With metrics enabled
func TestJSONLogFormatWithMetrics(t *testing.T) {
t.Parallel()
+
jsonLogFormat(t, true)
}
// Tests the log comes out in JSON format when JSON format is enabled. With metrics disabled
func TestJSONLogFormatNoMetrics(t *testing.T) {
t.Parallel()
+
jsonLogFormat(t, false)
}
@@ -575,6 +776,7 @@ func jsonLogFormat(t *testing.T, metric bool) {
func TestBadLogFormat(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -587,11 +789,11 @@ func TestBadLogFormat(t *testing.T) {
}
id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id)
- rc := waitForContainer(t, cli, id, 5)
+ rc := waitForContainer(t, cli, id, 20*time.Second)
if rc != 1 {
t.Errorf("Expected rc=1, got rc=%v", rc)
}
- expectTerminationMessage(t)
+ expectTerminationMessage(t, cli, id)
}
// TestMQJSONDisabled tests the case where MQ's JSON logging feature is
diff --git a/test/docker/docker_api_test_util.go b/test/docker/docker_api_test_util.go
index fd87991..b94545f 100644
--- a/test/docker/docker_api_test_util.go
+++ b/test/docker/docker_api_test_util.go
@@ -1,5 +1,5 @@
/*
-© 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.
@@ -43,6 +43,18 @@ import (
"github.com/docker/go-connections/nat"
)
+type containerDetails struct {
+ ID string
+ Name string
+ Image string
+ Path string
+ Args []string
+ CapAdd []string
+ CapDrop []string
+ User string
+ Env []string
+}
+
func imageName() string {
image, ok := os.LookupEnv("TEST_IMAGE")
if !ok {
@@ -59,6 +71,29 @@ func imageNameDevJMS() string {
return image
}
+// baseImage returns the ID of the underlying base image (e.g. "ubuntu" or "rhel")
+func baseImage(t *testing.T, cli *client.Client) string {
+ rc, out := runContainerOneShot(t, cli, "grep", "^ID=", "/etc/os-release")
+ if rc != 0 {
+ t.Fatal("Couldn't determine base image")
+ }
+ s := strings.Split(out, "=")
+ if len(s) < 2 {
+ t.Fatal("Couldn't determine base image string")
+ }
+ return s[1]
+}
+
+// devImage returns true if the image under test is a developer image,
+// determined by use of the MQ_ADMIN_PASSWORD environment variable
+func devImage(t *testing.T, cli *client.Client) bool {
+ rc, _ := runContainerOneShot(t, cli, "printenv", "MQ_ADMIN_PASSWORD")
+ if rc == 0 {
+ return true
+ }
+ return false
+}
+
// isWSL return whether we are running in the Windows Subsystem for Linux
func isWSL(t *testing.T) bool {
if runtime.GOOS == "linux" {
@@ -124,66 +159,79 @@ func getTempDir(t *testing.T, unixStylePath bool) string {
return "/tmp/"
}
-// terminationLogUnixPath returns the name of the file to use for the termination log message, with a UNIX path
-func terminationLogUnixPath(t *testing.T) string {
- // Warning: this directory must be accessible to the Docker daemon,
- // in order to enable the bind mount
- return getTempDir(t, true) + t.Name() + "-termination-log"
-}
-
-// terminationLogOSPath returns the name of the file to use for the termination log message, with an OS specific path
-func terminationLogOSPath(t *testing.T) string {
- // Warning: this directory must be accessible to the Docker daemon,
- // in order to enable the bind mount
- return getTempDir(t, false) + t.Name() + "-termination-log"
-}
-
-// terminationBind returns a string to use to bind-mount a termination log file.
-// This is done using a bind, because you can't copy files from /dev out of the container.
-func terminationBind(t *testing.T) string {
- n := terminationLogUnixPath(t)
- // Remove it if it already exists
- os.Remove(n)
- // Create the empty file
- f, err := os.OpenFile(n, os.O_WRONLY|os.O_CREATE, 0600)
- if err != nil {
- t.Fatal(err)
- }
- f.Close()
- return terminationLogOSPath(t) + ":/dev/termination-log"
-}
-
// terminationMessage return the termination message, or an empty string if not set
-func terminationMessage(t *testing.T) string {
- b, err := ioutil.ReadFile(terminationLogUnixPath(t))
+func terminationMessage(t *testing.T, cli *client.Client, ID string) string {
+ r, _, err := cli.CopyFromContainer(context.Background(), ID, "/run/termination-log")
if err != nil {
t.Log(err)
+ return ""
}
- return string(b)
+ b, err := ioutil.ReadAll(r)
+ tr := tar.NewReader(bytes.NewReader(b))
+ _, err = tr.Next()
+ if err != nil {
+ t.Log(err)
+ return ""
+ }
+ // read the complete content of the file h.Name into the bs []byte
+ content, err := ioutil.ReadAll(tr)
+ if err != nil {
+ t.Log(err)
+ return ""
+ }
+ return string(content)
}
-func expectTerminationMessage(t *testing.T) {
- m := terminationMessage(t)
+func expectTerminationMessage(t *testing.T, cli *client.Client, ID string) {
+ m := terminationMessage(t, cli, ID)
if m == "" {
t.Error("Expected termination message to be set")
}
}
-func cleanContainer(t *testing.T, cli *client.Client, ID string) {
+// logContainerDetails logs selected details about the container
+func logContainerDetails(t *testing.T, cli *client.Client, ID string) {
i, err := cli.ContainerInspect(context.Background(), ID)
if err == nil {
- // Log the results and continue
- t.Logf("Inspected container %v: %#v", ID, i)
- s, err := json.MarshalIndent(i, "", " ")
- if err != nil {
- t.Fatal(err)
+ d := containerDetails{
+ ID: ID,
+ Name: i.Name,
+ Image: i.Image,
+ Path: i.Path,
+ Args: i.Args,
+ CapAdd: i.HostConfig.CapAdd,
+ CapDrop: i.HostConfig.CapDrop,
+ User: i.Config.User,
+ Env: i.Config.Env,
}
- t.Logf("Inspected container %v: %v", ID, string(s))
+ // If you need more details, you can always just run `json.MarshalIndent(i, "", " ")` to see everything.
+ t.Logf("Container details: %+v", d)
}
+}
+
+func cleanContainerQuiet(t *testing.T, cli *client.Client, ID string) {
+ timeout := 10 * time.Second
+ err := cli.ContainerStop(context.Background(), ID, &timeout)
+ if err != nil {
+ // Just log the error and continue
+ t.Log(err)
+ }
+ opts := types.ContainerRemoveOptions{
+ RemoveVolumes: true,
+ Force: true,
+ }
+ err = cli.ContainerRemove(context.Background(), ID, opts)
+ if err != nil {
+ t.Error(err)
+ }
+}
+
+func cleanContainer(t *testing.T, cli *client.Client, ID string) {
+ logContainerDetails(t, cli, ID)
t.Logf("Stopping container: %v", ID)
timeout := 10 * time.Second
// Stop the container. This allows the coverage output to be generated.
- err = cli.ContainerStop(context.Background(), ID, &timeout)
+ err := cli.ContainerStop(context.Background(), ID, &timeout)
if err != nil {
// Just log the error and continue
t.Log(err)
@@ -195,11 +243,10 @@ func cleanContainer(t *testing.T, cli *client.Client, ID string) {
// Log the container output for any container we're about to delete
t.Logf("Console log from container %v:\n%v", ID, inspectTextLogs(t, cli, ID))
- m := terminationMessage(t)
+ m := terminationMessage(t, cli, ID)
if m != "" {
t.Logf("Termination message: %v", m)
}
- os.Remove(terminationLogUnixPath(t))
t.Logf("Removing container: %s", ID)
opts := types.ContainerRemoveOptions{
@@ -219,15 +266,36 @@ func runContainerWithPorts(t *testing.T, cli *client.Client, containerConfig *co
if containerConfig.Image == "" {
containerConfig.Image = imageName()
}
+ // Always run as the "mqm" user, unless the test has specified otherwise
+ if containerConfig.User == "" {
+ containerConfig.User = "mqm"
+ }
// if coverage
containerConfig.Env = append(containerConfig.Env, "COVERAGE_FILE="+t.Name()+".cov")
containerConfig.Env = append(containerConfig.Env, "EXIT_CODE_FILE="+getExitCodeFilename(t))
hostConfig := container.HostConfig{
Binds: []string{
coverageBind(t),
- terminationBind(t),
},
PortBindings: nat.PortMap{},
+ CapDrop: []string{
+ "ALL",
+ },
+ }
+ if devImage(t, cli) {
+ t.Logf("Detected MQ Advanced for Developers image — adding extra Linux capabilities to container")
+ hostConfig.CapAdd = []string{
+ "CHOWN",
+ "SETUID",
+ "SETGID",
+ "AUDIT_WRITE",
+ }
+ // Only needed for a RHEL-based image
+ if baseImage(t, cli) != "ubuntu" {
+ hostConfig.CapAdd = append(hostConfig.CapAdd, "DAC_OVERRIDE")
+ }
+ } else {
+ t.Logf("Detected MQ Advanced image - dropping all capabilities")
}
for _, p := range ports {
port := nat.Port(fmt.Sprintf("%v/tcp", p))
@@ -254,13 +322,62 @@ func runContainer(t *testing.T, cli *client.Client, containerConfig *container.C
return runContainerWithPorts(t, cli, containerConfig, nil)
}
+// runContainerOneShot runs a container with a custom entrypoint, as the root
+// user and with default capabilities
func runContainerOneShot(t *testing.T, cli *client.Client, command ...string) (int64, string) {
containerConfig := container.Config{
Entrypoint: command,
+ User: "root",
+ Image: imageName(),
}
- id := runContainer(t, cli, &containerConfig)
- defer cleanContainer(t, cli, id)
- return waitForContainer(t, cli, id, 10), inspectLogs(t, cli, id)
+ hostConfig := container.HostConfig{}
+ networkingConfig := network.NetworkingConfig{}
+ t.Logf("Running one shot container (%s): %v", containerConfig.Image, command)
+ ctr, err := cli.ContainerCreate(context.Background(), &containerConfig, &hostConfig, &networkingConfig, t.Name()+"OneShot")
+ if err != nil {
+ t.Fatal(err)
+ }
+ startOptions := types.ContainerStartOptions{}
+ err = cli.ContainerStart(context.Background(), ctr.ID, startOptions)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer cleanContainerQuiet(t, cli, ctr.ID)
+ rc := waitForContainer(t, cli, ctr.ID, 20*time.Second)
+ out := inspectLogs(t, cli, ctr.ID)
+ t.Logf("One shot container finished with rc=%v, output=%v", rc, out)
+ return rc, out
+}
+
+// runContainerOneShot runs a container with a custom entrypoint, as the root
+// user, with default capabilities, and a volume mounted
+func runContainerOneShotWithVolume(t *testing.T, cli *client.Client, bind string, command ...string) (int64, string) {
+ containerConfig := container.Config{
+ Entrypoint: command,
+ User: "root",
+ Image: imageName(),
+ }
+ hostConfig := container.HostConfig{
+ Binds: []string{
+ bind,
+ },
+ }
+ networkingConfig := network.NetworkingConfig{}
+ t.Logf("Running one shot container with volume (%s): %v", containerConfig.Image, command)
+ ctr, err := cli.ContainerCreate(context.Background(), &containerConfig, &hostConfig, &networkingConfig, t.Name()+"OneShotVolume")
+ if err != nil {
+ t.Fatal(err)
+ }
+ startOptions := types.ContainerStartOptions{}
+ err = cli.ContainerStart(context.Background(), ctr.ID, startOptions)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer cleanContainerQuiet(t, cli, ctr.ID)
+ rc := waitForContainer(t, cli, ctr.ID, 20*time.Second)
+ out := inspectLogs(t, cli, ctr.ID)
+ t.Logf("One shot container finished with rc=%v, output=%v", rc, out)
+ return rc, out
}
func startContainer(t *testing.T, cli *client.Client, ID string) {
@@ -309,19 +426,19 @@ func getCoverageExitCode(t *testing.T, orig int64) int64 {
}
// waitForContainer waits until a container has exited
-func waitForContainer(t *testing.T, cli *client.Client, ID string, timeout int64) int64 {
- rc, err := cli.ContainerWait(context.Background(), ID)
-
+func waitForContainer(t *testing.T, cli *client.Client, ID string, timeout time.Duration) int64 {
+ c, cancel := context.WithTimeout(context.Background(), timeout)
+ defer cancel()
+ rc, err := cli.ContainerWait(c, ID)
+ if err != nil {
+ t.Fatal(err)
+ }
if coverage() {
// COVERAGE: When running coverage, the exit code is written to a file,
// to allow the coverage to be generated (which doesn't happen for non-zero
// exit codes)
rc = getCoverageExitCode(t, rc)
}
-
- if err != nil {
- t.Fatal(err)
- }
return rc
}
@@ -395,7 +512,7 @@ func execContainer(t *testing.T, cli *client.Client, ID string, user string, cmd
}
func waitForReady(t *testing.T, cli *client.Client, ID string) {
- ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+ ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
defer cancel()
for {
diff --git a/test/docker/mqmetric_test.go b/test/docker/mqmetric_test.go
index cb3d67e..ee24ec3 100644
--- a/test/docker/mqmetric_test.go
+++ b/test/docker/mqmetric_test.go
@@ -1,5 +1,5 @@
/*
-© Copyright IBM Corporation 2018
+© Copyright IBM Corporation 2018, 2019
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import (
func TestGoldenPathMetric(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -53,6 +54,7 @@ func TestGoldenPathMetric(t *testing.T) {
func TestMetricNames(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -96,6 +98,7 @@ func TestMetricNames(t *testing.T) {
func TestMetricLabels(t *testing.T) {
t.Parallel()
+
requiredLabels := []string{"qmgr"}
cli, err := client.NewEnvClient()
if err != nil {
@@ -144,6 +147,7 @@ func TestMetricLabels(t *testing.T) {
func TestRapidFirePrometheus(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -177,6 +181,7 @@ func TestRapidFirePrometheus(t *testing.T) {
func TestSlowPrometheus(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -207,6 +212,7 @@ func TestSlowPrometheus(t *testing.T) {
func TestContainerRestart(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -254,6 +260,7 @@ func TestContainerRestart(t *testing.T) {
func TestQMRestart(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -279,7 +286,7 @@ func TestQMRestart(t *testing.T) {
// Restart just the QM (to simulate a lost connection)
t.Log("Stopping queue manager\n")
- rc, out := execContainer(t, cli, id, "mqm", []string{"endmqm", "-w", defaultMetricQMName})
+ rc, out := execContainer(t, cli, id, "mqm", []string{"endmqm", "-w", "-r", defaultMetricQMName})
if rc != 0 {
t.Fatalf("Failed to stop the queue manager. rc=%d, err=%s", rc, out)
}
@@ -311,6 +318,7 @@ func TestQMRestart(t *testing.T) {
func TestValidValues(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
@@ -346,6 +354,7 @@ func TestValidValues(t *testing.T) {
func TestChangingValues(t *testing.T) {
t.Parallel()
+
cli, err := client.NewEnvClient()
if err != nil {
t.Fatal(err)
diff --git a/test/messaging/buildah.sh b/test/messaging/buildah.sh
index 292b4ec..1d8c6a4 100755
--- a/test/messaging/buildah.sh
+++ b/test/messaging/buildah.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# © Copyright IBM Corporation 2018
+# © Copyright IBM Corporation 2018, 2019
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -22,24 +22,34 @@ set -e
# Use a "scratch" container, so the resulting image has minimal files
# Resulting image won't have yum, for example
-readonly ctr_mq=$(buildah from rhel7)
+readonly ctr_mq=$(buildah from rhel7-minimal)
readonly mnt_mq=$(buildah mount $ctr_mq)
readonly imagename=$1
-buildah run $ctr_mq -- yum install -y \
- java-1.7.0-openjdk-devel \
- java \
- which \
- wget
+microdnf_opts="--nodocs"
+# Check whether the host is registered with Red Hat
+if subscription-manager status ; then
+ # Host is subscribed, but the minimal image has no enabled repos
+ # 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/
+fi
+buildah run ${ctr_mq} -- microdnf ${microdnf_opts} install \
+ java-1.8.0-openjdk-devel \
+ java \
+ which \
+ wget
-buildah run $ctr_mq -- sh -c "cd /tmp && wget http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.2-bin.tar.gz"
-tar xvf $mnt_mq/tmp/apache-maven-3.2.2-bin.tar.gz -C $mnt_mq/tmp/
+buildah run $ctr_mq -- sh -c "cd /tmp && wget https://www-eu.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.tar.gz"
+tar xvf $mnt_mq/tmp/apache-maven-3.6.0-bin.tar.gz -C $mnt_mq/tmp/
mkdir -p $mnt_mq/usr/src/mymaven
cp pom.xml $mnt_mq/usr/src/mymaven/
cp -R src $mnt_mq/usr/src/mymaven/src
-buildah run $ctr_mq -- sh -c "cd /usr/src/mymaven && export M2_HOME=/tmp/apache-maven-3.2.2 && export M2=\$M2_HOME/bin && export PATH=\$M2:\$PATH && mvn --version && mvn dependency:go-offline install && mvn --offline install"
+buildah run $ctr_mq -- sh -c "cd /usr/src/mymaven && export M2_HOME=/tmp/apache-maven-3.6.0 && export M2=\$M2_HOME/bin && export PATH=\$M2:\$PATH && mvn --version && mvn dependency:go-offline install && mvn --offline install"
mkdir -p $mnt_mq/opt/app
@@ -53,13 +63,9 @@ cp $mnt_mq/usr/src/mymaven/target/lib/*.jar $mnt_mq/opt/app/
rm -rf $mnt_mq/tmp/*
rm -rf $mnt_mq/usr/src/mymaven
-# We can't uninstall tar or gzip because they are required
-buildah run $ctr_mq -- yum remove -y \
- wget
-
# Clean up cached files
-buildah run $ctr_mq -- yum clean all
-rm -rf ${mnt_mq}/var/cache/yum/*
+buildah run ${ctr_mq} -- microdnf ${microdnf_opts} clean all
+rm -rf ${mnt_mq}/etc/yum.repos.d/*
###############################################################################
# Contain image finalization
@@ -69,6 +75,7 @@ buildah config \
--os linux \
--label architecture=x86_64 \
--label name="${imagename%:*}" \
+ --cmd "" \
--entrypoint '["java", "-classpath", "/opt/app/*", "org.junit.platform.console.ConsoleLauncher", "-p", "com.ibm.mqcontainer.test", "--details", "verbose"]' \
$ctr_mq
buildah unmount $ctr_mq
diff --git a/test/messaging/pom.xml b/test/messaging/pom.xml
index 6644de3..9b32804 100644
--- a/test/messaging/pom.xml
+++ b/test/messaging/pom.xml
@@ -1,5 +1,5 @@