From ca27b38910f3ae99e4b2f7c6810c0ab787d4ecc0 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <chrisfer@us.ibm.com>
Date: Thu, 15 Mar 2018 17:14:22 -0400
Subject: [PATCH] FAB-8909 disable d/l images if no docker

if docker not installed, bypass install of images

Change-Id: I15bed77864567bc2189e1a5d7b5a935139c52ee8
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
---
 scripts/bootstrap.sh | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index c943f8f597f..347d97cd836 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -6,7 +6,7 @@
 #
 
 # current version of fabric released
-export VERSION=${1:-1.0.4}
+export VERSION=${1:-1.1.0}
 # current version of fabric-ca released
 export CA_VERSION=${2:-$VERSION}
 # current version of thirdparty images (couchdb, kafka and zookeeper) released
@@ -57,15 +57,26 @@ if [ $? != 0 ]; then
      echo "------> $VERSION fabric-ca-client binary is not available to download  (Avaialble from 1.1.0-rc1) <----"
      echo
 fi
-echo "===> Pulling fabric Images"
-dockerFabricPull ${FABRIC_TAG}
 
-echo "===> Pulling fabric ca Image"
-dockerCaPull ${CA_TAG}
+which docker >& /dev/null
+NODOCKER=$?
 
-echo "===> Pulling thirdparty docker images"
-dockerThirdPartyImagesPull ${THIRDPARTY_TAG}
+if [ "${NODOCKER}" == 0 ]; then
 
-echo
-echo "===> List out hyperledger docker images"
-docker images | grep hyperledger*
+	echo "===> Pulling fabric Images"
+	dockerFabricPull ${FABRIC_TAG}
+
+	echo "===> Pulling fabric ca Image"
+	dockerCaPull ${CA_TAG}
+
+	echo "===> Pulling thirdparty docker images"
+	dockerThirdPartyImagesPull ${THIRDPARTY_TAG}
+	echo
+
+	echo "===> List out hyperledger docker images"
+	docker images | grep hyperledger*
+else
+	echo "========================================================="
+	echo "Docker not installed, bypassing download of Fabric images"
+	echo "========================================================="
+fi