Merge "[FAB-14162] Pin fabric-samples in master to "unstable""

This commit is contained in:
Gari Singh 2019-02-22 13:00:08 +00:00 committed by Gerrit Code Review
commit e6894e82fb
17 changed files with 30 additions and 31 deletions

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
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.4.0-rc2, 1.4.0-rc2 and 0.4.14 respectively.
are 1.4.0, 1.4.0 and 0.4.14 respectively.
```bash
./scripts/bootstrap.sh [version] [ca version] [thirdparty_version]

View file

@ -10,6 +10,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}

View file

@ -24,8 +24,8 @@
"express-bearer-token": "^2.1.0",
"express-jwt": "^5.1.0",
"express-session": "^1.15.2",
"fabric-ca-client": "1.4.0-rc2",
"fabric-client": "1.4.0-rc2",
"fabric-ca-client": "unstable",
"fabric-client": "unstable",
"fs-extra": "^2.0.0",
"jsonwebtoken": "^7.3.0",
"log4js": "^0.6.38"

View file

@ -30,8 +30,8 @@
"express": "^4.16.1",
"express-jwt": "^5.3.0",
"express-session": "^1.15.6",
"fabric-ca-client": "1.4.0-rc2",
"fabric-client": "1.4.0-rc2",
"fabric-ca-client": "unstable",
"fabric-client": "unstable",
"log4js": "^0.6.38"
}
}

View file

@ -12,6 +12,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}

View file

@ -12,6 +12,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}

View file

@ -17,8 +17,8 @@
"author": "Hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "1.4.0-rc2",
"fabric-shim": "1.4.0-rc2"
"fabric-contract-api": "unstable",
"fabric-shim": "unstable"
},
"devDependencies": {
"chai": "^4.1.2",

View file

@ -21,8 +21,8 @@
"author": "Hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "1.4.0-rc2",
"fabric-shim": "1.4.0-rc2"
"fabric-contract-api": "unstable",
"fabric-shim": "unstable"
},
"devDependencies": {
"@types/chai": "^4.1.7",

View file

@ -10,6 +10,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}

View file

@ -10,8 +10,8 @@
"author": "",
"license": "ISC",
"dependencies": {
"fabric-network": "1.4.0-rc2",
"fabric-client": "1.4.0-rc2",
"fabric-network": "unstable",
"fabric-client": "unstable",
"js-yaml": "^3.12.0"
},
"devDependencies": {

View file

@ -18,8 +18,8 @@
"author": "hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "1.4.0-rc2",
"fabric-shim": "1.4.0-rc2"
"fabric-contract-api": "unstable",
"fabric-shim": "unstable"
},
"devDependencies": {
"chai": "^4.1.2",

View file

@ -10,8 +10,8 @@
"author": "",
"license": "ISC",
"dependencies": {
"fabric-network": "1.4.0-rc2",
"fabric-client": "1.4.0-rc2",
"fabric-network": "unstable",
"fabric-client": "unstable",
"js-yaml": "^3.12.0"
},
"devDependencies": {

View file

@ -18,8 +18,8 @@
"author": "hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "1.4.0-rc2",
"fabric-shim": "1.4.0-rc2"
"fabric-contract-api": "unstable",
"fabric-shim": "unstable"
},
"devDependencies": {
"chai": "^4.1.2",

View file

@ -7,9 +7,8 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"fabric-ca-client": "1.4.0-rc2",
"fabric-client": "1.4.0-rc2",
"grpc": "^1.6.0"
"fabric-ca-client": "unstable",
"fabric-client": "unstable"
},
"author": "Anthony O'Dowd",
"license": "Apache-2.0",

View file

@ -15,8 +15,8 @@
"author": "Hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-ca-client": "1.4.0-rc2",
"fabric-network": "1.4.0-rc2"
"fabric-ca-client": "unstable",
"fabric-network": "unstable"
},
"devDependencies": {
"chai": "^4.2.0",

View file

@ -18,8 +18,8 @@
"author": "Hyperledger",
"license": "Apache-2.0",
"dependencies": {
"fabric-ca-client": "1.4.0-rc2",
"fabric-network": "1.4.0-rc2"
"fabric-ca-client": "unstable",
"fabric-network": "unstable"
},
"devDependencies": {
"@types/chai": "^4.1.7",

View file

@ -6,7 +6,7 @@
#
# if version not passed in, default to latest released version
export VERSION=1.4.0-rc2
export VERSION=1.4.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
@ -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.4.0-rc2 1.4.0-rc2 0.4.14"
echo "would download docker images and binaries for version 1.4.0-rc2 (fabric) 1.4.0-rc2 (fabric-ca) 0.4.14 (thirdparty)"
echo "e.g. bootstrap.sh 1.4.0 1.4.0 0.4.14"
echo "would download docker images and binaries for version 1.4.0 (fabric) 1.4.0 (fabric-ca) 0.4.14 (thirdparty)"
}
dockerFabricPull() {