Commit graph

10 commits

Author SHA1 Message Date
Jim Zhang
ca8fad3151 [FAB-5260] Update samples to v1.0.0
basic-network:
 - moved "crypto-config" to top-level and removed
   "network" folder
 - added generate.sh to re-gen crypto materials
 - docker-compose.yaml to ref v1.0.0 images
 - add CLI to docker-compose
 - start.sh to only start CA, orderer, peer and couch
 - startFabric.sh to run start.sh, then launch CLI
   for create channel, install, instantiate, invoke
fabcar:
 - moved chaincode to central chaincode folder
 - moved "creds" to top-level and removed "network"
   folder
 - changed to use the basic-network as the target
   and removed docker-compose.yaml and crypto-config
 - updated package.json to require v1.0.0 modules

- added missing license headers
- restructured to use a central chaincode subdirectory

Change-Id: Ic784d1cf55ea51da5155624f3c38275883de1dca
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-12 09:07:39 -04:00
Nao Nishijima
6899719cbb [FAB-5195] byfn.sh help text is incorrect
The descriptions for "down" and "restart" are the same as "up".
This patch set changes the descriptions.

Change-Id: I0ee03e5d81faa4ad6a3c43354e8a44648288df90
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>
2017-07-06 11:21:21 -07:00
Gari Singh
f9c29542d7 [FAB-5038] Generate artifacts if they don't exist
If you run ./byfn -m up prior to running
./byfn -m generate, things will fail - which
would normally be OK except in the case where
you are running the Docker daemon as root -
which is the default on Linux systems.  The issue
is that the Docker daemon will automatically
generate host paths for volumes if they don't exist
and they will be owned by whoever is running the
Docker process resulting in the error reported
in FAB-5038.

To fix this, simply check for the existence of
the crypto-config folder and if it does not
exist run the equivalent commands as the
generate option

Change-Id: Ic5b48682a527951ac6eab5b5cf2d0fc6dbdaad56
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-06-30 12:53:56 -04:00
Adnan Choudhury
957a1ff17f [FAB-5062] Correct Gossip bootstrap setup in byfn
Corrects the Gossip bootsrap options for the 2 peers of org2 in the byfn
setup.  Peer1 should point to Peer0, and peer0 should not point to
itself.

Change-Id: I23074b7d5abe6ade4a57493808c3092c66086f62
Signed-off-by: Adnan Choudhury <adnan.choudhury@itpeoplecorp.com>
2017-06-28 16:13:18 -04:00
Jason Yellick
d58af569b7 [FAB-5031] Fix e2e template typo
There is a rogue network section which is indented at the top level of
the docker-compose-e2e-template.yaml file.  This has been reported by
users to cause errors when they attempt to tweak the byfn setup.

As best as I can tell, this network section is intended to be defined at
the top level and appears to have no adverse affect on the byfn.

Change-Id: I40b937d1f352af079754a84860bce025ec61594e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2017-06-27 09:40:29 -04:00
Srinivasan Muralidharan
ec254d983c Merge "FAB-4916 add marbles02 chaincode" 2017-06-23 11:54:14 +00:00
Christopher Ferris
ca0b5d2882 FAB-4916 add marbles02 chaincode
couchdb mode requires marbles02 chaincode

Change-Id: I0c329e8d42fd72f656e292815d1ba5790f4b709c
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-23 04:16:14 +00:00
Gari Singh
b4beeffd32 [FAB-4927] Modify TLS config
Last part of FAB-4626- need to
update the script to use the right
root CA for communciating with the
orderer.

Change-Id: I89e1468be6970b48c416f7058dd38c24b0eec506
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-06-22 22:06:00 -04:00
Christopher Ferris
241d08ee3c FAB-4910 fix incorrect network spec
and fix incorrect function name in byfn.sh
add *.tx and *.block files to .gitignore
add FABRIC_CFG_PATH setting

Change-Id: Id3457455354b1f2aea1a9661aa89dc677e05124b
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Rameshbabu <rameshbabu.thoomu@gmail.com>
2017-06-22 09:09:53 +08:00
Christopher Ferris
3297865248 FAB-4073 build your first network sample
address review comments

Change-Id: Ia2382005d4503f9dc7ba845a2d04f36237316cde
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 05:42:36 +00:00