From 1cba6639228ea371ef38c23e29c58d583f2917c6 Mon Sep 17 00:00:00 2001
From: Riccardo Biraghi <riccardo.biraghi@ibm.com>
Date: Mon, 23 Apr 2018 15:07:36 +0100
Subject: [PATCH] Minor corrections

---
 .travis.yml | 8 ++------
 Makefile    | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b22bcbe..f659f22 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,7 @@ cache:
 
 env:
   - DOCKER_DOWNGRADE="echo nothing to be done"
-  - DOCKER_DOWNGRADE="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_DOWNGRADE="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)"
 
 before_install:
   - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -38,7 +34,7 @@ script:
   - make vet
   - make build-devserver
   - make build-devjmstest
-  - $DOCKER_DOWNGRADE
+  - eval "$DOCKER_DOWNGRADE"
   - echo Running $(docker --version)
   - make test-devserver
 
diff --git a/Makefile b/Makefile
index a067a23..a40cc48 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ 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 }}")
+NUM_CPU=$(shell docker info --format "{{ .NCPU }}" || 1)
 # 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)