[FAB-12395] Pin samples and release for v1.3.0

Pin release-1.3 samples to node.js "~1.3.0" and update all version references in fabric-samples. Change-Id: Id053634ce22d7b9b15c0fc520178b901cc982fcd Signed-off-by: David Enyeart <enyeart@us.ibm.com>
[FAB-12257] allow balance-transfer for doscovery
2026-06-17 23:45:10 +00:00 · 2018-10-10 16:05:32 -04:00 · 2018-10-03 21:26:52 +00:00 · 2018-10-02 22:50:36 -04:00
14 changed files with 28 additions and 20 deletions
--- a/README.md
+++ b/README.md
@ -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.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
 ./scripts/bootstrap.sh [version] [ca version] [thirdparty_version]
--- a/balance-transfer/artifacts/docker-compose.yaml
+++ b/balance-transfer/artifacts/docker-compose.yaml
@ -74,6 +74,8 @@ services:
      - CORE_PEER_ID=peer0.org1.example.com
      - CORE_PEER_LOCALMSPID=Org1MSP
      - 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:
      - 7051:7051
      - 7053:7053
@ -91,6 +93,8 @@ services:
      - CORE_PEER_ID=peer1.org1.example.com
      - CORE_PEER_LOCALMSPID=Org1MSP
      - 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:
      - 7056:7051
      - 7058:7053
@ -108,6 +112,8 @@ services:
      - CORE_PEER_ID=peer0.org2.example.com
      - CORE_PEER_LOCALMSPID=Org2MSP
      - 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:
      - 8051:7051
      - 8053:7053
@ -125,6 +131,8 @@ services:
      - CORE_PEER_ID=peer1.org2.example.com
      - CORE_PEER_LOCALMSPID=Org2MSP
      - 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:
      - 8056:7051
      - 8058:7053
--- a/balance-transfer/artifacts/src/github.com/example_cc/node/package.json
+++ b/balance-transfer/artifacts/src/github.com/example_cc/node/package.json
@ -10,6 +10,6 @@
 	"engine-strict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "unstable"
+		"fabric-shim": "~1.3.0"
 	}
 }
--- a/balance-transfer/package.json
+++ b/balance-transfer/package.json
@ -24,8 +24,8 @@
    "express-bearer-token": "^2.1.0",
    "express-jwt": "^5.1.0",
    "express-session": "^1.15.2",
-    "fabric-ca-client": "unstable",
-    "fabric-client": "unstable",
+    "fabric-ca-client": "~1.3.0",
+    "fabric-client": "~1.3.0",
    "fs-extra": "^2.0.0",
    "jsonwebtoken": "^7.3.0",
    "log4js": "^0.6.38"
--- a/balance-transfer/typescript/package.json
+++ b/balance-transfer/typescript/package.json
@ -30,8 +30,8 @@
    "express": "^4.16.1",
    "express-jwt": "^5.3.0",
    "express-session": "^1.15.6",
-    "fabric-ca-client": "^1.0.2",
-    "fabric-client": "^1.0.2",
+    "fabric-ca-client": "~1.3.0",
+    "fabric-client": "~1.3.0",
    "log4js": "^0.6.38"
  }
 }
--- a/chaincode/chaincode_example02/node/package.json
+++ b/chaincode/chaincode_example02/node/package.json
@ -10,6 +10,6 @@
 	"engine-strict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "unstable"
+		"fabric-shim": "~1.3.0"
 	}
 }
--- a/chaincode/fabcar/node/package.json
+++ b/chaincode/fabcar/node/package.json
@ -12,6 +12,6 @@
 	"engine-strict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "unstable"
+		"fabric-shim": "~1.3.0"
 	}
 }
--- a/chaincode/marbles02/node/package.json
+++ b/chaincode/marbles02/node/package.json
@ -10,6 +10,6 @@
 	"engine-strict": true,
 	"license": "Apache-2.0",
 	"dependencies": {
-		"fabric-shim": "unstable"
+		"fabric-shim": "~1.3.0"
 	}
 }
--- a/fabcar/package.json
+++ b/fabcar/package.json
@ -7,8 +7,8 @@
        "test": "echo \"Error: no test specified\" && exit 1"
    },
    "dependencies": {
-        "fabric-ca-client": "unstable",
-        "fabric-client": "unstable",
+        "fabric-ca-client": "~1.3.0",
+        "fabric-client": "~1.3.0",
        "grpc": "^1.6.0"
    },
    "author": "Anthony O'Dowd",
--- a/fabric-ca/README.md
+++ b/fabric-ca/README.md
@ -27,8 +27,8 @@ an older released version, or from locally built docker images as follows:
    and Fabric CA.

    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`
-    will run the sample with 1.3.0-rc1 version of Fabric and Fabric CA.
+    `FABRIC_TAG` environment variable. For example, `export FABRIC_TAG=1.3.0`
+    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
    docker images. Fabric and Fabric CA repositories must be cloned with following
--- a/fabric-ca/makeDocker.sh
+++ b/fabric-ca/makeDocker.sh
@ -12,7 +12,7 @@
 # IMPORTANT: The following default FABRIC_TAG value should be updated for each
 # release after the fabric-orderer and fabric-peer images have been published
 # 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 NS=${NS:-hyperledger}
--- a/fabric-ca/start.sh
+++ b/fabric-ca/start.sh
@ -11,7 +11,7 @@
 # By default, this test is run with the latest released docker images.
 #
 # 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:
 #    export FABRIC_TAG=local
--- a/first-network/scripts/script.sh
+++ b/first-network/scripts/script.sh
@ -21,7 +21,7 @@ VERBOSE="$5"
 : ${VERBOSE:="false"}
 LANGUAGE=`echo "$LANGUAGE" | tr [:upper:] [:lower:]`
 COUNTER=1
-MAX_RETRY=5
+MAX_RETRY=10

 CC_SRC_PATH="github.com/chaincode/chaincode_example02/go/"
 if [ "$LANGUAGE" = "node" ]; then
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@ -6,11 +6,11 @@
 #

 # 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
 export CA_VERSION=$VERSION
 # 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 MARCH=$(uname -m)

@ -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.3.0-rc1 1.3.0-rc1 0.4.12"
-  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 "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 (fabric) 1.3.0 (fabric-ca) 0.4.13 (thirdparty)"
 }

 dockerFabricPull() {