From fceac2d4b8bbf2fdc162003e27978dc625f7e861 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Wed, 15 Nov 2017 13:08:07 +0000 Subject: [PATCH 1/3] Add hook into Makefile to allow MQ_PACKAGES to be specified --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ec87c0d..67b383b 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,7 @@ DOCKER_REPO_DEVSERVER ?= mq-devserver DOCKER_REPO_ADVANCEDSERVER ?= mq-advancedserver DOCKER_FULL_DEVSERVER = $(DOCKER_REPO_DEVSERVER):$(DOCKER_TAG) DOCKER_FULL_ADVANCEDSERVER = $(DOCKER_REPO_ADVANCEDSERVER):$(DOCKER_TAG) +MQ_PACKAGES ?=ibmmq-server ibmmq-java ibmmq-jre ibmmq-gskit ibmmq-msg-.* ibmmq-samples ibmmq-ams # Options to `go test` for the Docker tests TEST_OPTS_DOCKER ?= # Options to `go test` for the Kubernetes tests @@ -125,6 +126,7 @@ define docker-build-mq --label IBM_PRODUCT_ID=$4 \ --label IBM_PRODUCT_NAME=$5 \ --label IBM_PRODUCT_VERSION=$6 \ + --build-arg MQ_PACKAGES="$(MQ_PACKAGES)" \ . # Stop the web server (will also remove the container) $(DOCKER) kill $(BUILD_SERVER_CONTAINER) From 15acd8ccdc2aa5543ad2b65adcc5d7c046a45da8 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Wed, 15 Nov 2017 13:09:23 +0000 Subject: [PATCH 2/3] Correct installer package file name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e75a3c..eed1782 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ You can build an image for MQ Advanced, follow these steps: 1. Clone this repository into the correct location in your [`GOPATH`](https://github.com/golang/go/wiki/GOPATH) 2. Create a directory called `downloads` under the cloned directory tree -3. Download the MQ Advanced for Ubuntu (debs) installer package file `CNJR7ML.tar.gz` into the `downloads` directory +3. Download the MQ Advanced for Ubuntu (debs) installer package file `CNLE4ML.tar.gz` into the `downloads` directory 4. Run `make build-advancedserver` # Usage From faf6c4bc08182eb63d496db12ce5e0319dfb3341 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Thu, 16 Nov 2017 11:22:31 +0000 Subject: [PATCH 3/3] Correct indentation of new build-arg --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 67b383b..f777d1a 100644 --- a/Makefile +++ b/Makefile @@ -126,7 +126,7 @@ define docker-build-mq --label IBM_PRODUCT_ID=$4 \ --label IBM_PRODUCT_NAME=$5 \ --label IBM_PRODUCT_VERSION=$6 \ - --build-arg MQ_PACKAGES="$(MQ_PACKAGES)" \ + --build-arg MQ_PACKAGES="$(MQ_PACKAGES)" \ . # Stop the web server (will also remove the container) $(DOCKER) kill $(BUILD_SERVER_CONTAINER)