[FAB-7295] Fix download / bootstrap script

The variables used to determine the tags
to use when downloading fabric and
fabric-ca images were reversed.
In addition, if the optional parameter
for the fabric-ca version is not specified,
it should default to the same version as
fabric.

Change-Id: I1074d17d462e9bb0409a6311bbe6e3ee7e0ed6d9
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

scripts/bootstrap.sh

@@ -8,7 +8,7 @@
 # current version of fabric released
 export VERSION=${1:-1.0.4}
 # current version of fabric-ca released
-export CA_VERSION=${2:-1.0.4}
+export CA_VERSION=${2:-$VERSION}
 export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}')
 #Set MARCH variable i.e ppc64le,s390x,x86_64,i386
 MARCH=`uname -m`
@@ -31,8 +31,8 @@ dockerCaPull() {
       docker tag hyperledger/fabric-ca:$CA_TAG hyperledger/fabric-ca
 }
 
-: ${CA_TAG:="$MARCH-$VERSION"}
-: ${FABRIC_TAG:="$MARCH-$CA_VERSION"}
+: ${CA_TAG:="$MARCH-$CA_VERSION"}
+: ${FABRIC_TAG:="$MARCH-$VERSION"}
 
 echo "===> Downloading platform binaries"
 curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/${ARCH}-${VERSION}/hyperledger-fabric-${ARCH}-${VERSION}.tar.gz | tar xz