Skip to content

Commit 071f81f

Browse files
FAB-7090 improve d/l tracking process
provide a generic bootstrap.sh script that defaults to the latest release but can be provided a specific version to download/install. update the docs to reflect the modified short URL and current version. add more comprehensice handling for older versions of curl. Change-Id: I79e7326ae42ac25b1aabc754159d0d9aa67b62be Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
1 parent 792e4fe commit 071f81f

9 files changed

+16
-315
lines changed

docs/source/samples.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@ you will extract the platform-specific binaries:
4444

4545
.. code:: bash
4646
47-
curl -sSL https://goo.gl/fMh2s3 | bash
47+
curl -sSL https://goo.gl/x2LhaE | bash -s 1.1.0-preview
4848
4949
.. note:: If you get an error running the above curl command, you may
50-
have too old a version of curl. Please visit the
51-
:doc:`prereqs` page for additional information on where to
52-
find the latest version.
50+
have too old a version of curl that does not handle redirects.
51+
Please visit the :doc:`prereqs` page for additional information on
52+
where to find the latest version. Alternately, you can substitute the
53+
un-shortened URL:
54+
https://github.com/hyperledger/fabric/blob/master/scripts/bootstrap.sh
55+
56+
.. note:: You can use the command above for any published version of Hyperledger
57+
Fabric. Simply replace '1.1.0-preview' with the version identifier
58+
of the version you wish to install.
5359

5460
The curl command above downloads and executes a bash script
5561
that will download and extract all of the platform-specific binaries you
@@ -79,7 +85,7 @@ The script lists out the Docker images installed upon conclusion.
7985

8086
Look at the names for each image; these are the components that will ultimately
8187
comprise our Hyperledger Fabric network. You will also notice that you have
82-
two instances of the same image ID - one tagged as "x86_64-1.0.X" and
88+
two instances of the same image ID - one tagged as "x86_64-1.x.x" and
8389
one tagged as "latest".
8490

8591
.. note:: On different architectures, the x86_64 would be replaced

scripts/bootstrap-1.0.0-alpha2.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.0-beta.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.0-rc1.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.0.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.1.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.3.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.1.0-preview.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

scripts/bootstrap-1.0.2.sh renamed to scripts/bootstrap.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
# SPDX-License-Identifier: Apache-2.0
66
#
77

8-
export VERSION=1.0.2
8+
# current version of fabric released
9+
export VERSION=${1:-1.0.4}
10+
# current version of fabric-ca released
11+
export CA_VERSION=${2:-1.0.4}
912
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)}')
1013
#Set MARCH variable i.e ppc64le,s390x,x86_64,i386
1114
MARCH=`uname -m`
@@ -29,7 +32,7 @@ dockerCaPull() {
2932
}
3033

3134
: ${CA_TAG:="$MARCH-$VERSION"}
32-
: ${FABRIC_TAG:="$MARCH-$VERSION"}
35+
: ${FABRIC_TAG:="$MARCH-$CA_VERSION"}
3336

3437
echo "===> Downloading platform binaries"
3538
curl https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/${ARCH}-${VERSION}/hyperledger-fabric-${ARCH}-${VERSION}.tar.gz | tar xz

0 commit comments

Comments
 (0)