From 6edd320ded01b62be6c43a7ad33a1367c8041861 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 5 Jul 2018 08:01:17 -0400 Subject: [PATCH] FAB-9297 fix README links and update bootstrap.sh Change-Id: I00cac1a0c01a777af887104064e7dfa775359359 Signed-off-by: Christopher Ferris --- README.md | 4 ++-- scripts/bootstrap.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f35817e874..fbefa7299b 100644 --- a/README.md +++ b/README.md @@ -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] diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index b02d90047c..96c6da317a 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -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() {