Skip to content

Commit

Permalink
[FAB-14162] Pin fabric-samples in master to "unstable"
Browse files Browse the repository at this point in the history 
Pin fabric-samples in master to "unstable" so that latest node modules get used by default.

Change-Id: I36df30cb108a350c8e59756ed0d2f03610eb1d73
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
  • Loading branch information
@denyeart
denyeart committed Feb 12, 2019
1 parent 6007c09 commit 137327a
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 31 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion balance-transfer/artifacts/src/github.com/example_cc/node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}
4 changes: 2 additions & 2 deletions balance-transfer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions balance-transfer/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion chaincode/abstore/node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}
2 changes: 1 addition & 1 deletion chaincode/fabcar/javascript-low-level/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}
4 changes: 2 additions & 2 deletions chaincode/fabcar/javascript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions chaincode/fabcar/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion chaincode/marbles02/node/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"engine-strict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "1.4.0-rc2"
"fabric-shim": "unstable"
}
}
4 changes: 2 additions & 2 deletions commercial-paper/organization/digibank/application/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions commercial-paper/organization/digibank/contract/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions commercial-paper/organization/magnetocorp/application/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions commercial-paper/organization/magnetocorp/contract/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 2 additions & 3 deletions fabcar/javascript-low-level/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions fabcar/javascript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions fabcar/typescript/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions scripts/bootstrap.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() {
Expand Down

0 comments on commit 137327a

Please sign in to comment.