Merge "FAB-9297 fix README links and update bootstrap.sh" into release-1.2

This commit is contained in:
Kostas Christidis 2018-07-27 14:39:53 +00:00 committed by Gerrit Code Review
commit 520b1aa536
2 changed files with 5 additions and 5 deletions

View file

@ -9,11 +9,11 @@ intend to use to ensure alignment.
## Download Binaries and Docker Images
The [`scripts/bootstrap.sh`](https://github.com/hyperledger/fabric-samples/blob/release-1.1/scripts/bootstrap.sh)
The [`scripts/bootstrap.sh`](https://github.com/hyperledger/fabric-samples/blob/release-1.2/scripts/bootstrap.sh)
script will preload all of the requisite docker
images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally,
specify a version for fabric, fabric-ca and thirdparty images. Default versions
are 1.1.0, 1.1.0 and 0.4.7 respectively.
are 1.2.0, 1.2.0 and 0.4.10 respectively.
```bash
./scripts/bootstrap.sh [version] [ca version] [thirdparty_version]

View file

@ -10,7 +10,7 @@ export VERSION=1.2.0
# if ca version not passed in, default to latest released version
export CA_VERSION=$VERSION
# current version of thirdparty images (couchdb, kafka and zookeeper) released
export THIRDPARTY_IMAGE_VERSION=0.4.8
export THIRDPARTY_IMAGE_VERSION=0.4.10
export ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')")
export MARCH=$(uname -m)
@ -32,8 +32,8 @@ printHelp() {
echo "-d - bypass docker image download"
echo "-b - bypass download of platform-specific binaries"
echo
echo "e.g. bootstrap.sh 1.1.1"
echo "would download docker images and binaries for version 1.1.1"
echo "e.g. bootstrap.sh 1.2.0 1.2.0 0.4.10"
echo "would download docker images and binaries for version 1.2.0 (fabric) 1.2.0 (fabric-ca) 0.4.10 (thirdparty)"
}
dockerFabricPull() {