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>
The CLI timeout for byfn is currently set to
10000 seconds. This is not a huge issue, but
does mean that the CLI will hang around for
10000 seconds after the e2e is complete.
This simply changes the default timeout to
10 seconds.
Change-Id: I4e163ed248d9e937354e83c0d0143dc6748b6a08
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
This CR adds two new yaml files that are specific to a new
organization - Org3 - that will join the existing application
channel. Also adds a separate docker-compose that is specific
to the new org - Org3.
Update byfn.sh to remove the Org3 artifacts
Reliant on CR - 15323
Change-Id: I22a08be6f8472f981c4231491b7cae56906b71dd
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
It's possible to run byfn -m generate multiple
times depending on how you go through the
tutorials, start/stop the network, etc.
The crypto-config folder is deleted when
running byfn -m down and that will stay,
but now each time generateCerts is run the
cyrpto-config folder will be deleted as well.
Change-Id: Ie3851debd76ff0c50c84e14fbca56de2a28bd825
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
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>
Added quotes to $CURRENT_DIR in byfn.sh so that the current directory
can contain spaces and the script will still run properly.
Change-Id: I3853e3398c29c55c46603477fada5db023808431
Issue-id: FAB-5618
Signed-off-by: Ethan Coeytaux <eacoeytaux@gmail.com>
[FAB-5992] Fix error at line 42 of the script.sh in scripts dir,
and add tips in byfn.sh.
Change-Id: Id05277074dc240c06e1b47ac4eedf349e9555cfa
Signed-off-by: Zhangjiong Xuan <xuanzhangjiong@hyperchain.cn>
Remove docker-compose script to fix the byfn e2e test failures
Change-Id: Iee560b73f5fe535120ee888a816646d3aba224ed
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
fixed the unrecognized option on byfn.sh script when
providing the docker-compose file to start the network
Fix Issue # FAB-5603
Change-Id: I74234c53d8f82cbf2678f80aa3a898c3ec51c422
Signed-off-by: dsanchezseco <d.seco@protonmail.com>
Using the -f flag is possible to specify the docker-compose file to use on the
byfn.sh script to have a standar way to test the different configurations for
the samples project. The defautl is 'docker-compose-cli.yaml'
-h output updated as well.
Fix Issue # FAB-5576.
Change-Id: I8766ab930f05d9c4934b149872b9de3a299ff345
Signed-off-by: dsanchezseco <d.seco@protonmail.com>
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>
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>
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>
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>
