From 90c2bfdca88461b7b6e6501fa39a7b1f96470ddb Mon Sep 17 00:00:00 2001 From: luomin Date: Wed, 10 Jan 2018 14:36:33 +0900 Subject: [PATCH] [FAB-6934] fix devmode sample for v1.1 Fix the instructions in chain-docker-devmode for v1.1-perview. Resubmit this FAB-6934 due to the merge conflict. https://gerrit.hyperledger.org/r/#/c/15405/ Change-Id: I6d2dece3f48ca8b8c904c0745adb2253a7c6581a Signed-off-by: luomin --- chaincode-docker-devmode/README.rst | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/chaincode-docker-devmode/README.rst b/chaincode-docker-devmode/README.rst index 327e80ff08..40e6a217f8 100644 --- a/chaincode-docker-devmode/README.rst +++ b/chaincode-docker-devmode/README.rst @@ -13,7 +13,7 @@ of compiling chaincode and driving calls. Install Fabric Samples ---------------------- -If you haven't already done so, please install the :doc:`samples`. +If you haven't already done so, please install the doc [samples](http://hyperledger-fabric.readthedocs.io/en/latest/samples.html). Navigate to the ``chaincode-docker-devmode`` directory of the ``fabric-samples`` clone: @@ -27,7 +27,7 @@ Download docker images We need four docker images in order for "dev mode" to run against the supplied docker compose script. If you installed the ``fabric-samples`` repo clone and -followed the instructions to :ref:`download-platform-specific-binaries`, then +followed the instructions to [download-platform-specific-binaries](http://hyperledger-fabric.readthedocs.io/en/latest/samples.html#download-platform-specific-binaries), then you should have the necessary Docker images installed locally. .. note:: If you choose to manually pull the images then you must retag them as @@ -40,16 +40,16 @@ should see something similar to following: docker images REPOSITORY TAG IMAGE ID CREATED SIZE - hyperledger/fabric-tools latest e09f38f8928d 4 hours ago 1.32 GB - hyperledger/fabric-tools x86_64-1.0.0-rc1-snapshot-f20846c6 e09f38f8928d 4 hours ago 1.32 GB - hyperledger/fabric-orderer latest 0df93ba35a25 4 hours ago 179 MB - hyperledger/fabric-orderer x86_64-1.0.0-rc1-snapshot-f20846c6 0df93ba35a25 4 hours ago 179 MB - hyperledger/fabric-peer latest 533aec3f5a01 4 hours ago 182 MB - hyperledger/fabric-peer x86_64-1.0.0-rc1-snapshot-f20846c6 533aec3f5a01 4 hours ago 182 MB - hyperledger/fabric-ccenv latest 4b70698a71d3 4 hours ago 1.29 GB - hyperledger/fabric-ccenv x86_64-1.0.0-rc1-snapshot-f20846c6 4b70698a71d3 4 hours ago 1.29 GB - -.. note:: If you retrieved the images through the :ref:`download-platform-specific-binaries`, + hyperledger/fabric-tools latest c584c20ac82b 9 days ago 1.42 GB + hyperledger/fabric-tools x86_64-1.1.0-preview c584c20ac82b 9 days ago 1.42 GB + hyperledger/fabric-orderer latest 2fccc91736df 9 days ago 159 MB + hyperledger/fabric-orderer x86_64-1.1.0-preview 2fccc91736df 9 dyas ago 159 MB + hyperledger/fabric-peer latest 337f3d90b452 9 days ago 165 MB + hyperledger/fabric-peer x86_64-1.1.0-preview 337f3d90b452 9 days ago 165 MB + hyperledger/fabric-ccenv latest 82489d1c11e8 9 days ago 1.35 GB + hyperledger/fabric-ccenv x86_64-1.1.0-preview 82489d1c11e8 9 days ago 1.35 GB + +.. note:: If you retrieved the images through the [download-platform-specific-binaries](http://hyperledger-fabric.readthedocs.io/en/latest/samples.html#download-platform-specific-binaries), then you will see additional images listed. However, we are only concerned with these four. @@ -86,8 +86,8 @@ Now, compile your chaincode: .. code:: bash - cd chaincode_example02 - go build + cd chaincode_example02/go + go build -o chaincode_example02 Now run the chaincode: @@ -114,7 +114,7 @@ We'll leverage the CLI container to drive these calls. .. code:: bash - peer chaincode install -p chaincodedev/chaincode/chaincode_example02 -n mycc -v 0 + peer chaincode install -p chaincodedev/chaincode/chaincode_example02/go -n mycc -v 0 peer chaincode instantiate -n mycc -v 0 -c '{"Args":["init","a","100","b","200"]}' -C myc Now issue an invoke to move ``10`` from ``a`` to ``b``.