epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 15:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FAB-12415] samples for 1.3.0 (master cleanup)

Browse source 
fabric-samples already completed in release-1.3 branch.
This CR fixes up version references in master to match.

Change-Id: I95f9d2db5e5fed749560768ca0ba753bb7cae700
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2018-10-10 17:20:24 -04:00
parent bc7317c475
commit c9251480d5
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -13,7 +13,7 @@ The [`scripts/bootstrap.sh`](https://github.com/hyperledger/fabric-samples/blob/
script will preload all of the requisite docker script will preload all of the requisite docker
images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally, images for Hyperledger Fabric and tag them with the 'latest' tag. Optionally,
specify a version for fabric, fabric-ca and thirdparty images. Default versions specify a version for fabric, fabric-ca and thirdparty images. Default versions
are 1.3.0-rc1, 1.3.0-rc1 and 0.4.12 respectively. are 1.3.0, 1.3.0 and 0.4.13 respectively.
```bash ```bash
./scripts/bootstrap.sh [version] [ca version] [thirdparty_version] ./scripts/bootstrap.sh [version] [ca version] [thirdparty_version]

4
fabric-ca/README.md
View file

@ -27,8 +27,8 @@ an older released version, or from locally built docker images as follows:
and Fabric CA. and Fabric CA.
b. Older versions of Fabric and Fabric CA can be used by setting the b. Older versions of Fabric and Fabric CA can be used by setting the
`FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.3.0-rc1` `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.3.0`
will run the sample with 1.3.0-rc1 version of Fabric and Fabric CA. will run the sample with 1.3.0 version of Fabric and Fabric CA.
c. The sample can also be run with locally built Fabric and Fabric CA c. The sample can also be run with locally built Fabric and Fabric CA
docker images. Fabric and Fabric CA repositories must be cloned with following docker images. Fabric and Fabric CA repositories must be cloned with following

2
fabric-ca/makeDocker.sh
View file

@ -12,7 +12,7 @@
# IMPORTANT: The following default FABRIC_TAG value should be updated for each # IMPORTANT: The following default FABRIC_TAG value should be updated for each
# release after the fabric-orderer and fabric-peer images have been published # release after the fabric-orderer and fabric-peer images have been published
# for the release. # for the release.
export FABRIC_TAG=${FABRIC_TAG:-1.3.0-rc1} export FABRIC_TAG=${FABRIC_TAG:-1.3.0}
export FABRIC_CA_TAG=${FABRIC_CA_TAG:-${FABRIC_TAG}} export FABRIC_CA_TAG=${FABRIC_CA_TAG:-${FABRIC_TAG}}
export NS=${NS:-hyperledger} export NS=${NS:-hyperledger}

2
fabric-ca/start.sh
View file

@ -11,7 +11,7 @@
# By default, this test is run with the latest released docker images. # By default, this test is run with the latest released docker images.
# #
# To run against a specific fabric/fabric-ca version: # To run against a specific fabric/fabric-ca version:
# export FABRIC_TAG=1.3.0-rc1 # export FABRIC_TAG=1.3.0
# #
# To run with locally built images: # To run with locally built images:
# export FABRIC_TAG=local # export FABRIC_TAG=local

8
scripts/bootstrap.sh
View file

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