mirror of
https://github.com/hyperledger/fabric-samples.git
synced 2026-06-18 16:05:10 +00:00
Compare commits
3 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
94c21eb9bd | ||
|
|
2f817dab28 | ||
|
|
68fc877619 |
14 changed files with 28 additions and 20 deletions
|
|
@ -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]
|
||||||
|
|
|
||||||
|
|
@ -74,6 +74,8 @@ services:
|
||||||
- CORE_PEER_ID=peer0.org1.example.com
|
- CORE_PEER_ID=peer0.org1.example.com
|
||||||
- CORE_PEER_LOCALMSPID=Org1MSP
|
- CORE_PEER_LOCALMSPID=Org1MSP
|
||||||
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051
|
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org1.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
|
||||||
ports:
|
ports:
|
||||||
- 7051:7051
|
- 7051:7051
|
||||||
- 7053:7053
|
- 7053:7053
|
||||||
|
|
@ -91,6 +93,8 @@ services:
|
||||||
- CORE_PEER_ID=peer1.org1.example.com
|
- CORE_PEER_ID=peer1.org1.example.com
|
||||||
- CORE_PEER_LOCALMSPID=Org1MSP
|
- CORE_PEER_LOCALMSPID=Org1MSP
|
||||||
- CORE_PEER_ADDRESS=peer1.org1.example.com:7051
|
- CORE_PEER_ADDRESS=peer1.org1.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org1.example.com:7051
|
||||||
ports:
|
ports:
|
||||||
- 7056:7051
|
- 7056:7051
|
||||||
- 7058:7053
|
- 7058:7053
|
||||||
|
|
@ -108,6 +112,8 @@ services:
|
||||||
- CORE_PEER_ID=peer0.org2.example.com
|
- CORE_PEER_ID=peer0.org2.example.com
|
||||||
- CORE_PEER_LOCALMSPID=Org2MSP
|
- CORE_PEER_LOCALMSPID=Org2MSP
|
||||||
- CORE_PEER_ADDRESS=peer0.org2.example.com:7051
|
- CORE_PEER_ADDRESS=peer0.org2.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:7051
|
||||||
ports:
|
ports:
|
||||||
- 8051:7051
|
- 8051:7051
|
||||||
- 8053:7053
|
- 8053:7053
|
||||||
|
|
@ -125,6 +131,8 @@ services:
|
||||||
- CORE_PEER_ID=peer1.org2.example.com
|
- CORE_PEER_ID=peer1.org2.example.com
|
||||||
- CORE_PEER_LOCALMSPID=Org2MSP
|
- CORE_PEER_LOCALMSPID=Org2MSP
|
||||||
- CORE_PEER_ADDRESS=peer1.org2.example.com:7051
|
- CORE_PEER_ADDRESS=peer1.org2.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051
|
||||||
|
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org2.example.com:7051
|
||||||
ports:
|
ports:
|
||||||
- 8056:7051
|
- 8056:7051
|
||||||
- 8058:7053
|
- 8058:7053
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,6 @@
|
||||||
"engine-strict": true,
|
"engine-strict": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fabric-shim": "unstable"
|
"fabric-shim": "~1.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,8 +24,8 @@
|
||||||
"express-bearer-token": "^2.1.0",
|
"express-bearer-token": "^2.1.0",
|
||||||
"express-jwt": "^5.1.0",
|
"express-jwt": "^5.1.0",
|
||||||
"express-session": "^1.15.2",
|
"express-session": "^1.15.2",
|
||||||
"fabric-ca-client": "unstable",
|
"fabric-ca-client": "~1.3.0",
|
||||||
"fabric-client": "unstable",
|
"fabric-client": "~1.3.0",
|
||||||
"fs-extra": "^2.0.0",
|
"fs-extra": "^2.0.0",
|
||||||
"jsonwebtoken": "^7.3.0",
|
"jsonwebtoken": "^7.3.0",
|
||||||
"log4js": "^0.6.38"
|
"log4js": "^0.6.38"
|
||||||
|
|
|
||||||
|
|
@ -30,8 +30,8 @@
|
||||||
"express": "^4.16.1",
|
"express": "^4.16.1",
|
||||||
"express-jwt": "^5.3.0",
|
"express-jwt": "^5.3.0",
|
||||||
"express-session": "^1.15.6",
|
"express-session": "^1.15.6",
|
||||||
"fabric-ca-client": "^1.0.2",
|
"fabric-ca-client": "~1.3.0",
|
||||||
"fabric-client": "^1.0.2",
|
"fabric-client": "~1.3.0",
|
||||||
"log4js": "^0.6.38"
|
"log4js": "^0.6.38"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,6 @@
|
||||||
"engine-strict": true,
|
"engine-strict": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fabric-shim": "unstable"
|
"fabric-shim": "~1.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,6 @@
|
||||||
"engine-strict": true,
|
"engine-strict": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fabric-shim": "unstable"
|
"fabric-shim": "~1.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,6 @@
|
||||||
"engine-strict": true,
|
"engine-strict": true,
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fabric-shim": "unstable"
|
"fabric-shim": "~1.3.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fabric-ca-client": "unstable",
|
"fabric-ca-client": "~1.3.0",
|
||||||
"fabric-client": "unstable",
|
"fabric-client": "~1.3.0",
|
||||||
"grpc": "^1.6.0"
|
"grpc": "^1.6.0"
|
||||||
},
|
},
|
||||||
"author": "Anthony O'Dowd",
|
"author": "Anthony O'Dowd",
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ VERBOSE="$5"
|
||||||
: ${VERBOSE:="false"}
|
: ${VERBOSE:="false"}
|
||||||
LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
|
LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
|
||||||
COUNTER=1
|
COUNTER=1
|
||||||
MAX_RETRY=5
|
MAX_RETRY=10
|
||||||
|
|
||||||
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/"
|
CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/"
|
||||||
if [ "$LANGUAGE" = "node" ]; then
|
if [ "$LANGUAGE" = "node" ]; then
|
||||||
|
|
|
||||||
|
|
@ -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() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue