Merge pull request hyperledger-archives#2083 from s390xlinux/master

Only pull baseimage if a local one doesn't exist
manish-sethi · Jul 14, 2016 · 3242eb3 · 3242eb3
2 parents b2689b9 + 8197fab
commit 3242eb3
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/scripts/provision/docker.sh b/scripts/provision/docker.sh
@@ -53,20 +53,26 @@ DOCKERHUB_NAME=$NAME:$RELEASE
 
 CURDIR=`dirname $0`
 
-echo "BUILD-CACHE: Pulling \"$DOCKERHUB_NAME\" from dockerhub.."
-docker pull $DOCKERHUB_NAME
 docker inspect $DOCKERHUB_NAME 2>&1 > /dev/null
 if [ "$?" == "0" ]; then
-    echo "BUILD-CACHE: Success!"
+    echo "BUILD-CACHE: exists!"
     BASENAME=$DOCKERHUB_NAME
 else
-    echo "BUILD-CACHE: WARNING - Build-cache unavailable, attempting local build"
-    (cd $CURDIR/../../images/base && make docker DOCKER_TAG=localbuild)
-    if [ "$?" != "0" ]; then
-        echo "ERROR: Build-cache could not be compiled locally"
-        exit -1
+    echo "BUILD-CACHE: Pulling \"$DOCKERHUB_NAME\" from dockerhub.."
+    docker pull $DOCKERHUB_NAME
+    docker inspect $DOCKERHUB_NAME 2>&1 > /dev/null
+    if [ "$?" == "0" ]; then
+	echo "BUILD-CACHE: Success!"
+	BASENAME=$DOCKERHUB_NAME
+    else
+	echo "BUILD-CACHE: WARNING - Build-cache unavailable, attempting local build"
+	(cd $CURDIR/../../images/base && make docker DOCKER_TAG=localbuild)
+	if [ "$?" != "0" ]; then
+            echo "ERROR: Build-cache could not be compiled locally"
+            exit -1
+	fi
+	BASENAME=$NAME:localbuild
     fi
-    BASENAME=$NAME:localbuild
 fi
 
 # Ensure that we have the baseimage we are expecting