Merge branch 'master' of github.com:yeasy/docker-compose-files

hyperledger/1.0/README.md

@@ -55,14 +55,15 @@ $ docker-compose up
 
 Check the output log that the peer is connected to the ca and orderer successfully.
 
-There will be 3 running containers.
+There will be 4 running containers.
 
 ```bash
 $ docker ps -a
 CONTAINER ID        IMAGE                        COMMAND                  CREATED             STATUS              PORTS                                             NAMES
-2367ccb6463d        hyperledger/fabric-peer      "peer node start"        6 minutes ago      Up 6 minutes       7050/tcp, 7052-7059/tcp, 0.0.0.0:7051->7051/tcp   fabric-peer0
+44b6870b0802        hyperledger/fabric-peer      "bash -c 'while tr..."   33 seconds ago      Up 32 seconds       7050-7059/tcp                                     fabric-cli
-02eaf86496ca        hyperledger/fabric-orderer   "orderer"                6 minutes ago      Up 6 minutes       0.0.0.0:7050->7050/tcp                            fabric-orderer
+ed2c4927c0ed        hyperledger/fabric-peer      "peer node start -..."   33 seconds ago      Up 32 seconds       7050/tcp, 7052-7059/tcp, 0.0.0.0:7051->7051/tcp   fabric-peer0
-71c2246e1165        hyperledger/fabric-ca        "fabric-ca server ..."   6 minutes ago      Up 6 minutes       7054/tcp, 0.0.0.0:8888->8888/tcp 
+af5ba8f213bb        hyperledger/fabric-orderer   "orderer"                34 seconds ago      Up 33 seconds       0.0.0.0:7050->7050/tcp                            fabric-orderer0
+bbe31b98445f        hyperledger/fabric-ca        "fabric-ca-server ..."   34 seconds ago      Up 33 seconds       7054/tcp, 0.0.0.0:8888->8888/tcp
 ```
 
 ## Usage
@@ -71,37 +72,65 @@ CONTAINER ID        IMAGE                        COMMAND                  CREATE
 
 By default, all the peer will join the system chain of `testchainid`.
 
-After the cluster is synced successfully, you can validate by deploying, invoking or querying chaincode from the container or from the host.
+```bash
+$ docker exec -it fabric-cli bash
+root@cli:/go/src/github.com/hyperledger/fabric# peer channel list  
+Channels peers has joined to:
+	 testchainid
+UTC [main] main -> INFO 001 Exiting.....
+```
 
-#### Deploy
+After the cluster is synced successfully, you can validate by install/instantiate, invoking or querying chaincode from the container or from the host.
-Use `docker exec -it fabric-peer0 bash` to open a bash inside container `fabric-peer0`, which will accept our chaincode testing commands of `install/instantiate`, `invoke` and `query`.
 
-Inside the container, run the following command to deploy a new chaincode of the example02. The chaincode will initialize two accounts: `a` and `b`, with value of `100` and `200`.
+#### install&instantiate
+Use `docker exec -it fabric-cli bash` to open a bash inside container `fabric-cli`, which will accept our chaincode testing commands of `install/instantiate`, `invoke` and `query`.
+
+Inside the container, run the following command to install a new chaincode of the example02. The chaincode will initialize two accounts: `a` and `b`, with value of `100` and `200`.
 
 ```bash
-$ docker exec -it fabric-peer0 bash
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode  install -v 1.0 -n test_cc -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a","100","b","200"]}' -o orderer0:7050
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode  install -v 1.0 -n test_cc -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a","100","b","200"]}' -o orderer0:7050
+```
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode  instantiate -v 1.0 -n test_cc -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a","100","b","200"]}' -o orderer0:7050
+This will take a while, and the result may look like following.
+
+```bash
+[golang-platform] writeGopathSrc -> INFO 001 rootDirectory = /go/src
+container] WriteFolderToTarPackage -> INFO 002 rootDirectory = /go/src
+[main] main -> INFO 003 Exiting.....
+```
+
+Then instantiate the chaincode test_cc on defaule channel testchainid.
+```bash
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode  instantiate -v 1.0 -n test_cc -p github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02 -c '{"Args":["init","a","100","b","200"]}' -o orderer0:7050
+```
+
+This will take a while, and the result may look like following:
+
+```bash
+UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 001 Using default escc
+UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 002 Using default vscc
+UTC [main] main -> INFO 003 Exiting.....
 ```
 
 There should be no error in the return log, and in the peer nodes's output. 
 Wait several seconds till the deploy is finished.
 
-If the `peer chaincode install` and `peer chaincode instantiate` commands are executed successfully, there will generate a new chaincode container, besides the 3 existing one, name like `dev-peer0-test_cc-1.0`.
+If the `peer chaincode install` and `peer chaincode instantiate` commands are executed successfully, there will generate a new chaincode container, besides the 4 existing one, name like `dev-peer0-test_cc-1.0`.
 ```bash
 $ docker ps
 CONTAINER ID        IMAGE                        COMMAND                  CREATED             STATUS              PORTS                                             NAMES
-edc9740c265c        dev-peer0-test_cc-1.0        "/opt/gopath/bin/t..."   34 minutes ago      Up 34 minutes                                                         dev-peer0-test_cc-1.0
+cf7bf529f214        dev-peer0-test_cc-1.0        "chaincode -peer.a..."   58 seconds ago      Up 58 seconds                                                         dev-peer0-test_cc-1.0
-2367ccb6463d        hyperledger/fabric-peer      "peer node start"        36 minutes ago      Up 36 minutes       7050/tcp, 7052-7059/tcp, 0.0.0.0:7051->7051/tcp   fabric-peer0
+44b6870b0802        hyperledger/fabric-peer      "bash -c 'while tr..."   14 minutes ago      Up 14 minutes       7050-7059/tcp                                     fabric-cli
-02eaf86496ca        hyperledger/fabric-orderer   "orderer"                36 minutes ago      Up 36 minutes       0.0.0.0:7050->7050/tcp                            fabric-orderer
+ed2c4927c0ed        hyperledger/fabric-peer      "peer node start -..."   14 minutes ago      Up 14 minutes       7050/tcp, 7052-7059/tcp, 0.0.0.0:7051->7051/tcp   fabric-peer0
-71c2246e1165        hyperledger/fabric-ca        "fabric-ca server ..."   36 minutes ago      Up 36 minutes       7054/tcp, 0.0.0.0:8888->8888/tcp 
+af5ba8f213bb        hyperledger/fabric-orderer   "orderer"                14 minutes ago      Up 14 minutes       0.0.0.0:7050->7050/tcp                            fabric-orderer0
+bbe31b98445f        hyperledger/fabric-ca        "fabric-ca-server ..."   14 minutes ago      Up 14 minutes       7054/tcp, 0.0.0.0:8888->8888/tcp                  fabric-ca
+
 ```
 
 And will also generate a new chaincode image, name like `dev-peer0-test_cc-1.0`.
 ```bash
 $ docker images
 REPOSITORY                         TAG                    IMAGE ID            CREATED              SIZE
-dev-peer0-test_cc-1.0              latest                          dd5ea867023e        36 minutes ago      874 MB
+dev-peer0-test_cc-1.0              latest                 84e5422eead5        About a minute ago   176 MB
 ...
 ```
 
@@ -111,7 +140,7 @@ Inside the container, query the existing value of `a` and `b`.
 *Notice that the query method can be called by invoke a transaction.*
 
 ```bash
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","a"]}' -o orderer0:7050
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","a"]}' -o orderer0:7050
 ```
 
 The final output may look like the following, with a payload value of `100`.
@@ -124,7 +153,7 @@ Query Result: 100
 Query the value of `b`
 
 ```bash
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode invoke -n test_cc -c '{"Args":["query","b"]}' -o orderer0:7050
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode invoke -n test_cc -c '{"Args":["query","b"]}' -o orderer0:7050
 ```
 
 The final output may look like the following, with a payload value of `200`.
@@ -139,7 +168,7 @@ Query Result: 200
 Inside the container, invoke a transaction to transfer `10` from `a` to `b`.
 
 ```bash
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode invoke -n test_cc -c '{"Args":["invoke","a","b","10"]}' -o orderer0:7050
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode invoke -n test_cc -c '{"Args":["invoke","a","b","10"]}' -o orderer0:7050
 ```
 
 The final result may look like the following, the response should be `OK`.
@@ -153,12 +182,12 @@ The final result may look like the following, the response should be `OK`.
 Query again the existing value of `a` and `b`.
 
 ```bash
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","a"]}' -o orderer0:7050
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","a"]}' -o orderer0:7050
 ```
 The new value of `a` should be 90.
 
 ```bash
-root@peer0:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","b"]}' -o orderer0:7050
+root@cli:/go/src/github.com/hyperledger/fabric# peer chaincode query -n test_cc -c '{"Args":["query","b"]}' -o orderer0:7050
 ```
 The new value of `b` should be 210.
 
@@ -278,6 +307,15 @@ Peer joined the channel!
 
 Will receive the `Peer joined the channel!` response if succeed.
 
+Then use the following command, we will find the channels that peers joined.
+
+```bash
+root@cli:/go/src/github.com/hyperledger/fabric# peer channel list
+Channels peers has joined to:
+	 newchannel
+2017-04-11 03:44:40.313 UTC [main] main -> INFO 001 Exiting.....
+```
+
 #### Install&Instantiate
 
 First install a chaincode named `test_cc` to `peer0`.
@@ -409,6 +447,31 @@ Query Result: 210
 [main] main -> INFO 001 Exiting.....
 ```
 
+Finally, the output of the chaincode containers may look like following.
+
+```bash
+root@Self-Dev:~$ docker logs dev-peer0-test_cc-1.0
+ex02 Init
+Aval = 100, Bval = 200
+ex02 Invoke
+Query Response:{"Name":"a","Amount":"100"}
+ex02 Invoke
+Query Response:{"Name":"b","Amount":"200"}
+ex02 Invoke
+Aval = 90, Bval = 210
+ex02 Invoke
+Query Response:{"Name":"a","Amount":"90"}
+ex02 Invoke
+Query Response:{"Name":"b","Amount":"210"}
+```
+
+### Run the auto-test with shell 
+
+As the shell shown, it will auto execute test steps. 
+
+```bash
+root@cli:/go/src/github.com/hyperledger/fabric# ./peer/scripts/new-channel-auto-test.sh
+```
 
 ## Acknowledgement
 * [Hyperledger Fabric](https://github.com/hyperledger/fabric/) project.

hyperledger/1.0/docker-compose-new-channel.yml

@@ -94,7 +94,7 @@ services:
         #- ./e2e_cli/examples/:/opt/gopath/src/github.com/hyperledger/fabric/examples/
         #- ../chaincode/go/:/opt/gopath/src/github.com/hyperledger/fabric/examples/chaincode/go
         - ./e2e_cli/crypto:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
-        #- ./e2e_cli/scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
+        - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
     depends_on:
       - peer0
       - orderer0

hyperledger/1.0/docker-compose.yml

@@ -45,13 +45,14 @@ services:
     environment:
       - CORE_PEER_ID=peer0
       - CORE_PEER_GOSSIP_ORGLEADER=true
-      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:7050
+      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
     links:
       - orderer0
     ports:
       - 7051:7051
     depends_on:
       - orderer0
+    command: peer node start -o orderer0:7050
 
   cli:
     extends:
@@ -70,6 +71,7 @@ services:
     depends_on:
       - peer0
       - orderer0
+    command: bash -c 'while true; do sleep 2017; done' 
 
 #networks:
 #  default:

hyperledger/1.0/scripts/new-channel-auto-test.sh

@@ -0,0 +1,156 @@
+#!/bin/bash
+
+CHANNEL_NAME="$1"
+: ${CHANNEL_NAME:="newchannel"}
+: ${TIMEOUT:="60"}
+COUNTER=0
+MAX_RETRY=5
+CC_PATH=github.com/hyperledger/fabric/examples/chaincode/go/chaincode_example02
+
+echo "Channel name : "$CHANNEL_NAME
+
+verifyResult () {
+	if [ $1 -ne 0 ] ; then
+		echo "!!!!!!!!!!!!!!! "$2" !!!!!!!!!!!!!!!!"
+                echo "================== ERROR !!! FAILED to execute MVE =================="
+		echo
+   		exit 1
+	fi
+}
+
+setGlobals () {
+
+	CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peer/peer0/localMspConfig
+	CORE_PEER_ADDRESS=peer0:7051
+	CORE_PEER_LOCALMSPID="Org0MSP"
+	#env |grep CORE
+}
+
+createChannel() {
+	CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/orderer/localMspConfig
+	CORE_PEER_LOCALMSPID="OrdererMSP"
+	env|grep CORE_PEER_MSPCONFIGPATH
+	env|grep CORE_PEER_LOCALMSPID
+
+	peer channel create -c ${CHANNEL_NAME} -o orderer0:7050 -f peer/crypto/orderer/channel.tx >&log.txt
+	res=$?
+	cat log.txt
+
+	verifyResult $res "Channel creation failed"
+	echo
+
+	# verify file newchannel.block exist
+	if [ -s newchannel.block ]; then
+		res=$?
+		verifyResult $res "Channel created failed"
+	fi
+		echo "================channel \"$CHANNEL_NAME\" is created successfully ==============="
+}
+
+## Sometimes Join takes time hence RETRY atleast for 5 times
+
+joinChannel () {
+    echo "===================== PEER0 joined on the channel \"$CHANNEL_NAME\" ===================== "
+	setGlobals
+	env|grep CORE_PEER_MSPCONFIGPATH
+	env|grep CORE_PEER_LOCALMSPID
+	env|grep CORE_PEER_ADDRESS
+	peer channel join -b ${CHANNEL_NAME}.block -o orderer0:7050 >&log.txt
+	res=$?
+	cat log.txt
+	if [ $res -ne 0 -a $COUNTER -lt $MAX_RETRY ]; then
+		COUNTER=` expr $COUNTER + 1`
+		echo "PEER0 failed to join the channel, Retry after 2 seconds"
+		sleep 2
+		joinWithRetry
+	else
+		COUNTER=0
+	fi
+        verifyResult $res "After $MAX_RETRY attempts, PEER0 has failed to Join the Channel"
+}
+
+installChaincode () {
+	setGlobals
+	peer chaincode install -n test_cc -p ${CC_PATH}  -v 1.0 -o orderer0:7050 >&log.txt
+	res=$?
+	cat log.txt
+        verifyResult $res "Chaincode installation on remote peer0 has Failed"
+	echo "===================== Chaincode is installed success on remote peer0===================== "
+	echo
+}
+
+instantiateChaincode () {
+	setGlobals
+	local starttime=$(date +%s)
+	peer chaincode instantiate -o orderer0:7050 -C ${CHANNEL_NAME} -n test_cc -v 1.0 -p ${CC_PATH} -c '{"Args":["init","a","100","b","200"]}' -P "OR	('Org0MSP.member','Org1MSP.member')" >&log.txt
+	res=$?
+	cat log.txt
+	verifyResult $res "Chaincode instantiation on PEER0 on channel '$CHANNEL_NAME' failed"
+	echo "=========== Chaincode Instantiation on PEER0 on channel '$CHANNEL_NAME' is successful ========== "
+	echo "Instantiate spent $(($(date +%s)-starttime)) secs"
+	echo
+}
+
+chaincodeQuery () {
+  setGlobals
+  local rc=1
+  local starttime=$(date +%s)
+
+  while test "$(($(date +%s)-starttime))" -lt "$TIMEOUT" -a $rc -ne 0
+  do
+     sleep 3
+     echo "Attempting to Query PEER0 ...$(($(date +%s)-starttime)) secs"
+     peer chaincode query -C ${CHANNEL_NAME} -n test_cc -c '{"Args":["query","a"]}' >&log.txt
+     test $? -eq 0 && VALUE=$(cat log.txt | awk '/Query Result/ {print $NF}')
+     test "$VALUE" = "$1" && let rc=0
+  done
+  echo
+  cat log.txt
+  if test $rc -eq 0 ; then
+	echo "===================== Query on PEER0 on channel '$CHANNEL_NAME' is successful ===================== "
+
+  else
+	echo "!!!!!!!!!!!!!!! Query result on PEER0 is INVALID !!!!!!!!!!!!!!!!"
+        echo "================== ERROR !!! FAILED to execute MVE test =================="
+	echo
+  fi
+}
+
+chaincodeInvoke () {
+	setGlobals
+	peer chaincode invoke -o orderer0:7050 -C ${CHANNEL_NAME} -n test_cc -c '{"Args":["invoke","a","b","10"]}' >&log.txt
+	res=$?
+	cat log.txt
+	verifyResult $res "Invoke execution on PEER0 failed "
+	echo "========= Invoke transaction on PEER0 on channel '$CHANNEL_NAME' is successful ===== "
+	echo
+}
+
+echo "====================1.Create channel(default newchannel) ============================="
+createChannel
+
+echo "====================2.Join pee0 to the channel ======================================"
+joinChannel
+
+echo "=====================3.Install chaincode test_cc on Peer0/Org0========================"
+installChaincode
+
+echo "=====================4.Instantiate chaincode, this will take a while, pls waiting...==="
+instantiateChaincode
+
+echo "====================5.Query the existing value of a===================================="
+chaincodeQuery  100
+
+#Query b on chaincode
+#chaincodeQuery b 200
+
+echo "=====================6.Invoke a transaction to transfer 10 from a to b=================="
+chaincodeInvoke
+
+echo "=====================7.Check if the result of a is 90==================================="
+chaincodeQuery  90
+
+echo
+echo "=====================8.All GOOD, MVE Test completed ===================== "
+echo
+exit 0