From 173c73215a47a6d9f309f4e9eecc2d9997f081d4 Mon Sep 17 00:00:00 2001
From: rameshthoomu <rameshbabu.thoomu@gmail.com>
Date: Fri, 9 Mar 2018 10:23:45 -0500
Subject: [PATCH] FAB-8748 Get fabric-ca-client binary from bootstrap.sh
Include curl command in bootstrap.sh script to download
fabric-ca-client binary from nexus2. This will keep
fabric-ca-client binary in bin directory along with fabric
binaries. Also update samples.rst doc to include the missing
binary list
Change-Id: If23e7bb75323d15a19a8703e4c2c4bcde5dbb391
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
---
docs/source/samples.rst | 4 +++-
scripts/bootstrap.sh | 9 ++++++++-
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/docs/source/samples.rst b/docs/source/samples.rst
index a8ac26e66..ac9a9473e 100644
--- a/docs/source/samples.rst
+++ b/docs/source/samples.rst
@@ -72,8 +72,10 @@ created above. It retrieves four platform-specific binaries:
* ``cryptogen``,
* ``configtxgen``,
- * ``configtxlator``, and
+ * ``configtxlator``,
* ``peer``
+ * ``orderer`` and
+ * ``fabric-ca-client``
and places them in the ``bin`` sub-directory of the current working
directory.
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index e63dfd153..c943f8f59 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -47,9 +47,16 @@ dockerCaPull() {
: ${FABRIC_TAG:="$MARCH-$VERSION"}
: ${THIRDPARTY_TAG:="$MARCH-$THIRDPARTY_IMAGE_VERSION"}
-echo "===> Downloading platform binaries"
+echo "===> Downloading platform specific fabric binaries"
curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/${ARCH}-${VERSION}/hyperledger-fabric-${ARCH}-${VERSION}.tar.gz | tar xz
+echo "===> Downloading platform specific fabric-ca-client binary"
+curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric-ca/hyperledger-fabric-ca/${ARCH}-${VERSION}/hyperledger-fabric-ca-${ARCH}-${VERSION}.tar.gz | tar xz
+if [ $? != 0 ]; then
+ echo
+ 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}
--
GitLab