Commit graph

5 commits

Author SHA1 Message Date
Artem Barger
2571c960a8
[FAB-56431]: Add dependency for couchdb into peer.
Currently peer and couchdb containers started simulateously, while
clearly peer depends on availability of the state db, therfore this
commit add dependency declaration into docker-compose.yaml file to make
sure to start couchdb before peer container.

Change-Id: Id2302a32fba9234d04ef3f4e6bd24ac92a766995
Signed-off-by: Artem Barger <bartem@il.ibm.com>
2017-08-06 12:56:30 +03:00
Nao Nishijima
2f4e9b851c [FAB-5130] Invalid syntax in docker compose files
This patch set deletes unused docker-compose environment variables.
Now CouchDB section in docker-compose file uses DB_URL env variables.
But the variables are not used in CouchDB container.

Change-Id: I8e84255e1ea00498b787bdd4042cdb909a96667c
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>
2017-07-24 14:57:48 -07:00
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
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
fbc120f1fc FAB-4851 basic network sample
Change-Id: I751254bc4b2340c33444248050ddffcc8428ab36
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 05:46:02 +00:00