Commit graph

14 commits

Author SHA1 Message Date
Surya Lanka
d50fbc4f69 [FAB-15803] Upgrade to v1.4.2
Upgrading to v1.4.2 from v1.4.1 and enabling
v1_4_2 capabilities on orderer system channel
and applicaiton channel for channel and orderer groups

Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
Change-Id: I41e575ba8b56122a55fe148b65972884aaf49627
2019-07-12 17:57:48 +00:00
Will Lahti
c21bbbaa38 Update samples to use new logging env variables
FAB-12669 #done

Change-Id: Ibb50cc77cb64c3cc138af9afde7273636f34b816
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2018-12-05 15:32:41 -05:00
Jason Yellick
f3ba862017 Merge "FAB-8564 add debug commands to byfn" 2018-03-01 04:22:55 +00:00
Jason Yellick
7362928e99 [FAB-8567] Alt: Always use volumes for ledger (m)
Docker compose makes volume management easy and transparent to the user.
By defaulting the ledgers to be docker compose volumes, we transparently
get ledger persistence for the ugprade case, and may trivially tear the
volumes down in the docker-compose down command with the addition of the
--volumes flag.  This would allow the upgrade scenario to work without
the use of the '-p' flag, and is likely to be generally much cleaner.

Change-Id: I80b36a63370065a7aad0f9c284ec578533123d2b
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2018-02-28 19:02:05 -05:00
Christopher Ferris
10526d5a1d FAB-8564 add debug commands to byfn
replace DEBUG level logging w/INFO, but add in
shell debug statements for all fabric commands
for improved UX

Change-Id: I97a19db0373ecaf7a504cb95d4815a11cd64dfed
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-02-28 10:05:33 -05:00
Jason Yellick
981efba232 [FAB-8503] Prevent CLI container from exiting
The pattern of the byfn scripts and of our tutorial is to start the CLI
container, then docker exec commands against it.  For some reason, we
only start the CLI container with a command of 'sleep 1000' which causes
it exit after this time.

This causes headaches of having to restart the CLI container and is only
saving the overhead of one idle bash process.  From a usability
it seems far better to leave an idle bash process so that we can be
assured the container is still running.

Change-Id: I8d5c860b89226a28f15d42f5a19e42b923bfa8c1
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2018-02-25 20:20:42 -05:00
Surya
4f2cd8d4ac [FAB-8445] Adding IMAGE_TAG option to byfn
Adding IMAGE_TAG option to byfn script to launch specific
version of fabric network

Usage: ./byfn.sh up -i 1.1.0-alpha

Change-Id: I67a1d01257abd7021ea344c354c6e1c97eebf4f7
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2018-02-23 16:10:15 -05:00
Arnaud J Le Hors
1883ae9589 [FAB-7527] Improves BYFN
This change fixes a set of related issues.

It fixes the use of the cli timeout setting. It is now merely about
the maximum time spent waiting for a response.

The e2e script is no longer run from docker-compose but by calling
docker exec from byfn.sh and docker-compose now merely has the cli
waiting/sleeping for 1000 seconds.

This not only allows starting the network without automatically
running the e2e script, it also allows byfn.sh to properly end when
the e2e script ends rather than hang. It also makes the tutorial
simpler.

The time the cli container waits/sleeps cannot be changed other than
by editing the config file but this shouldn't be a problem.

This change also fixes the log output of the e2e script so that peers
are consistantly being referenced as in peerX.orgY.

In addition, this changes the usage of byfn.sh so that the -m
parameter is no longer needed. One merely needs to type "./byfn.sh up"
rather than "./byfn.sh -m up". The old way is still supported though,
for human backward compatibility. ;-) And by default the answer to the
prompt for continuation is "y" so the user can simply continue with a
hit of the return key.

Change-Id: I3e2409d81018f97ec9306ce6e1ae916d8fe18fec
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2017-12-21 00:22:13 +01:00
ratnakar
a7be462ab4 [FAB-6895] chaincode mounting issue
Chaincode mount path has been corrected with this fix so
that artifacts (ex. mychannel.block etc.,) won't be visible on
the host machine and the cli container upon restart.

Change-Id: I9b59c80d1cac3034d9cd7d9e19b2931df8b3988e
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-11-06 11:41:56 -05:00
ratnakar
44c204d8b6 [FAB-5898] porting samples to node.js chaincode
Fabric 1.1 supports javascript chaincode. This changeset
addresses porting of the golang chaincode to node.js
chiancode and the corresponding README files

Change-Id: Iae24e713f16ab3508fe0cc18ee062ffa412b8ba6
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-10-15 21:12:11 -04:00
Krishna Harsha Voora
7778837ebb [FAB-5394] Introduce Delay as configurable variable
Introduce delay as configurable variable for byfn.sh

Change-Id: I8ab05f44c68b36bd95f175c9b5f5091d11fa7083
Signed-off-by: Krishna Harsha Voora <krishvoor@in.ibm.com>
2017-07-24 09:47:26 +00: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
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