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-13407] Align fabric-samples with 1.4.0-rc2 release

Browse source 
Change-Id: If784ead9b35c89b874078fe3e87e702fd3be5953
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This commit is contained in:
David Enyeart 2018-12-20 15:26:04 -05:00
parent ab46e3548c
commit 9567985d29
14 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -13,7 +13,7 @@ node ('hyp-x') { // trigger build on x86_64 node
env.ARCH = "amd64" env.ARCH = "amd64"
env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim() env.VERSION = sh(returnStdout: true, script: 'curl -O https://raw.githubusercontent.com/hyperledger/fabric/master/Makefile && cat Makefile | grep "BASE_VERSION =" | cut -d "=" -f2').trim()
env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile env.VERSION = "$VERSION" // BASE_VERSION from fabric Makefile
env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep BASEIMAGE_RELEASE= | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile env.BASE_IMAGE_VER = sh(returnStdout: true, script: 'cat Makefile | grep "BASEIMAGE_RELEASE =" | cut -d "=" -f2').trim() // BASEIMAGE Version from fabric Makefile
env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus env.IMAGE_TAG = "${ARCH}-${VERSION}-stable" // fabric latest stable version from nexus
env.PROJECT_VERSION = "${VERSION}-stable" env.PROJECT_VERSION = "${VERSION}-stable"
env.BASE_IMAGE_TAG = "${ARCH}-${BASE_IMAGE_VER}" //fabric baseimage version env.BASE_IMAGE_TAG = "${ARCH}-${BASE_IMAGE_VER}" //fabric baseimage version

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

2
balance-transfer/artifacts/src/github.com/example_cc/node/package.json
View file

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

2
chaincode/chaincode_example02/node/package.json
View file

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

2
chaincode/fabcar/javascript-low-level/package.json
View file

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

4
chaincode/fabcar/javascript/package.json
View file

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

4
chaincode/fabcar/typescript/package.json
View file

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

2
chaincode/marbles02/node/package.json
View file

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

4
commercial-paper/organization/digibank/contract/package.json
View file

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

4
commercial-paper/organization/magnetocorp/contract/package.json
View file

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

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.4.0-rc1` `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.4.0-rc2`
will run the sample with 1.4.0-rc1 version of Fabric and Fabric CA. will run the sample with 1.4.0-rc2 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.4.0-rc1} export FABRIC_TAG=${FABRIC_TAG:-1.4.0-rc2}
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.4.0-rc1 # export FABRIC_TAG=1.4.0-rc2
# #
# To run with locally built images: # To run with locally built images:
# export FABRIC_TAG=local # export FABRIC_TAG=local

6
scripts/bootstrap.sh
View file

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