From 3ebd64f4da387884f11a7e240d0ec9863b77d11e Mon Sep 17 00:00:00 2001 From: Luke J Powlett Date: Thu, 20 Feb 2020 15:27:40 +0000 Subject: [PATCH] Added ibm- prefix to default image name (#60) * Added ibm- prefix to default image name --- Makefile | 8 ++------ docs/security.md | 4 ++-- docs/testing.md | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a80c2f4..8f78767 100644 --- a/Makefile +++ b/Makefile @@ -40,9 +40,9 @@ MQ_SDK_ARCHIVE ?= $(MQ_ARCHIVE_DEV_$(MQ_VERSION)) # Options to `go test` for the Docker tests TEST_OPTS_DOCKER ?= # MQ_IMAGE_ADVANCEDSERVER is the name of the built MQ Advanced image -MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server +MQ_IMAGE_ADVANCEDSERVER ?=ibm-mqadvanced-server # MQ_IMAGE_DEVSERVER is the name of the built MQ Advanced for Developers image -MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev +MQ_IMAGE_DEVSERVER ?=ibm-mqadvanced-server-dev # MQ_TAG is the tag of the built MQ Advanced image & MQ Advanced for Developers image MQ_TAG ?=$(MQ_VERSION)-$(ARCH) # MQ_PACKAGES specifies the MQ packages (.deb or .rpm) to install. Defaults vary on base image. @@ -124,8 +124,6 @@ else endif ifneq "$(RELEASE)" "$(EMPTY)" - MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server - MQ_IMAGE_DEVSERVER=ibm-mqadvanced-server-dev MQ_TAG=$(MQ_VERSION)-$(RELEASE)-$(ARCH) EXTRA_LABELS=--label release=$(RELEASE) endif @@ -134,8 +132,6 @@ MQ_IMAGE_DEV_FULL_RELEASE_NAME=$(MQ_IMAGE_DEVSERVER):$(MQ_TAG) ifeq "$(MQ_DELIVERY_REGISTRY_HOSTNAME)" "ibmcom" MQ_IMAGE_DEVSERVER_DOCKERHUB=mq -else ifeq "$(MQ_DELIVERY_REGISTRY_HOSTNAME)" "ibmcorp" - MQ_IMAGE_DEVSERVER_DOCKERHUB=mqadvanced-server-dev endif ############################################################################### diff --git a/docs/security.md b/docs/security.md index f124ade..6a7421b 100644 --- a/docs/security.md +++ b/docs/security.md @@ -16,7 +16,7 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - mqadvanced-server:9.1.4.0-amd64 + ibm-mqadvanced-server:9.1.4.0-amd64 ``` The MQ Advanced for Developers image does require the "chown", "setuid", "setgid" and "audit_write" capabilities (plus "dac_override" if you're using an image based on Red Hat Enterprise Linux). This is because it uses the "sudo" command to change passwords inside the container. For example, in Docker, you could do the following: @@ -31,7 +31,7 @@ docker run \ --env LICENSE=accept \ --env MQ_QMGR_NAME=QM1 \ --detach \ - mqadvanced-server-dev:9.1.4.0-amd64 + ibm-mqadvanced-server-dev:9.1.4.0-amd64 ``` ### SELinux diff --git a/docs/testing.md b/docs/testing.md index f684c79..38e387b 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -24,7 +24,7 @@ make test-advancedserver You can specify the image to use directly by using the `MQ_IMAGE_ADVANCEDSERVER` or `MQ_IMAGE_DEVSERVER` variables, for example: ``` -MQ_IMAGE_ADVANCEDSERVER=mqadvanced-server:9.1.4.0-amd64 make test-advancedserver +MQ_IMAGE_ADVANCEDSERVER=ibm-mqadvanced-server:9.1.4.0-amd64 make test-advancedserver ``` You can pass parameters to `go test` with an environment variable. For example, to run the "TestGoldenPath" test, run the following command:: @@ -33,7 +33,7 @@ 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.1.4.0-amd64`: +You can also use the same environment variables you specified when [building](./building), for example, the following will try and test an image called `ibm-mqadvanced-server:9.1.4.0-amd64`: ``` MQ_VERSION=9.1.4.0 make test-advancedserver