From e6049ecb93679f432989553f534506e107b6eb84 Mon Sep 17 00:00:00 2001 From: Rob Parker Date: Thu, 18 Oct 2018 13:43:48 +0100 Subject: [PATCH] add integration into the docker tag (#233) --- Makefile-RHEL | 4 ++-- Makefile-UBUNTU | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile-RHEL b/Makefile-RHEL index 8dc2409..7ddd69e 100644 --- a/Makefile-RHEL +++ b/Makefile-RHEL @@ -32,9 +32,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 and tag of the built MQ Advanced image -MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) +MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server:$(MQ_VERSION)-integration-$(ARCH) # MQ_IMAGE_DEVSERVER is the name and tag of the built MQ Advanced for Developers image -MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) +MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev:$(MQ_VERSION)-integration-$(ARCH) # MQ_IMAGE_SDK is the name and tag of the built MQ Advanced for Developers SDK image MQ_IMAGE_SDK ?=mq-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) # MQ_IMAGE_GOLANG_SDK is the name and tag of the built MQ Advanced for Developers SDK image, plus Go tools diff --git a/Makefile-UBUNTU b/Makefile-UBUNTU index cf84362..5a6e87d 100644 --- a/Makefile-UBUNTU +++ b/Makefile-UBUNTU @@ -32,9 +32,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 and tag of the built MQ Advanced image -MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) +MQ_IMAGE_ADVANCEDSERVER ?=mqadvanced-server:$(MQ_VERSION)-integration-$(ARCH) # MQ_IMAGE_DEVSERVER is the name and tag of the built MQ Advanced for Developers image -MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) +MQ_IMAGE_DEVSERVER ?=mqadvanced-server-dev:$(MQ_VERSION)-integration-$(ARCH) # MQ_IMAGE_SDK is the name and tag of the built MQ Advanced for Developers SDK image MQ_IMAGE_SDK ?=mq-sdk:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) # MQ_IMAGE_GOLANG_SDK is the name and tag of the built MQ Advanced for Developers SDK image, plus Go tools