From 4826e83c9ea07b8c38afac13cc1e6b1446d6abbf Mon Sep 17 00:00:00 2001 From: Riccardo Biraghi Date: Mon, 23 Apr 2018 15:27:22 +0100 Subject: [PATCH] Use ?= for NUM_CPU --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a40cc48..d7b4396 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,8 @@ ARCH = $(shell uname -m) BUILD_SERVER_CONTAINER=build-server # NUM_CPU is the number of CPUs available to Docker. Used to control how many # test run in parallel -NUM_CPU=$(shell docker info --format "{{ .NCPU }}" || 1) +NUM_CPU = $(shell docker info --format "{{ .NCPU }}") +NUM_CPU ?= 2 # BASE_IMAGE_TAG is a normalized version of BASE_IMAGE, suitable for use in a Docker tag BASE_IMAGE_TAG=$(subst /,-,$(subst :,-,$(BASE_IMAGE))) MQ_IMAGE_DEVSERVER_BASE=mqadvanced-server-dev-base:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG)