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 <[email protected]>
hyperledger · Mar 15, 2018 · ca27b38 · ca27b38
1 parent 60c71cb
commit ca27b38
Showing 1 changed file with 21 additions and 10 deletions.
diff --git 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