The first-network CLI yaml was recently enhanced to use volume mounts
for the ledger directories. There is the additional e2e yaml which
depends on the container definitions and is now failing. This CR simply
edits its template to include these new volume definitions.
Change-Id: Ia5b7b93b2be4f9de1f0ebfaa804f8ef713fb935d
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
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: Id008d50487e8d304d6e2517300402dfd1cc8c0c3
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
This CR is for the release branch.
This CR adds a new docker-compose-persist.yaml file which creates a
volume mount in the current directory at ./ledgers/<container> and binds
it to the ledger directory for the container.
It also adds a '-p' flag to the byfn.sh script to allow users to include
this new compose file when bringing up the network.
Change-Id: I311ca1d2157dd87e61ad890c98cde7c118d5ee7d
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Signed-off-by: Surya <suryalnvs@gmail.com>
The compose files were edited to add IMAGE_TAG, but fabric-tools was
skipped.
Change-Id: I3bf4d0570a1711b8845c92560dc4c6278db5a186
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Existing sample documentation assumes that 'docker-compose' may be run
directly in the first-network directory. Now that IMAGE_TAG is
parameterized, this creates failures if the var is unset.
This CR adds a default (which may be overridden via the environment) so
that this breakage does not occur.
Change-Id: Ibea4a3b3f823dfd3fc0e1eca3ab824b8230a8a41
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Adding IMAGE_TAG option to byfn script to launch specific version of
fabric network
Usage: ./byfn.sh -m up -i 1.0.6
Change-Id: Icaf9791705d50d7ccba380ac7a0867a9f9951be6
Signed-off-by: Surya <suryalnvs@gmail.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: Id3abb044ae9385d239af25e63bacb8d4d3ccbf71
Signed-off-by: Gari Singh <gari.r.singh@gmail.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: Ib80d720bfdec1ffe100b1b6b5c752e72b583890b
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Update the fabcar sample with an easier flow
Remove hardcoded fields in the invoke program
Change-Id: I9a06cdd317c2afec80720ac7d728d38fc62c6f63
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
No major changes needed to work with v1.0.3
but this will merge any changes from master
to the release branch
Change-Id: I5fe1f01ea2f53a0596eead1caed401b57f6167ec
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
The license text at the bottom of the
README is a bit confusing as it might imply
that the entire project is licensed under
Creative Commons
See [FAB-6326] for details
Change-Id: Ic9178ac0d55763b5c911ec7c188312e5a6b98c88
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
A new data storage model was implemented in the fabric-samples which allows
for high-throughput of transactions. The storage model is based on storing
deltas of a value, creating a new row for each transaction, and then merging
these deltas when the final value of the variable is required.
This concept is similar to simple integer-based CRDTs, where add or subtract
updates are constantly sent to the ledger and the merge function combines all
of these deltas into one value.
Change-Id: I60b5cdc295d4503d7d496d016bf215c78eff5710
Signed-off-by: Alexandre Pauwels <alexj.pauwels@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>
Remove docker-compose script to fix the byfn e2e test failures
Change-Id: Iee560b73f5fe535120ee888a816646d3aba224ed
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
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>
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>
- Made it possible to deploy the app (both the client and fabric
backend) to a location other than localhost
- Made it possible to work with a backend over grpc instead of always
assuming grpcs
- Made the list of target peers for instantiate and invoke calls
to be optional
- Enabled target networks to be controlled by an env variable
Change-Id: Ie394cf7e8f6ed47d970d4be992f2f6a0394fff7f
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
CouchDB usernames and passwords can be enabled by adding
additional environment variables to docker compose files.
The environment variables are added without values.
This will create peer and couchdb containers without
CouchDB passwords enabled.
Initializing the variables will create a CouchDB container
with and admin username and password. The peer will also be
created with the CouchDB username in the ledger config.
Change-Id: I56c93111b0a4bd29c714df5a50af82517641bb3b
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
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>
Add a script to allow users to preload the Fabric docker
images without having to run the curl command in the RTD.
Change-Id: I3b6c682c3e2ab1f230f7af8c3ce0b95bbb8fd024
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Git Bash is a prereq for Windows users
required to run the various sample
scripts. Git Bash by default will
convert paths and this causes the
issue identified by FAB-5392.
Luckily Git Bash provides supports an
environment variable to override this
behavior.
Change-Id: I66e52eb2953c0dcc9f04903a1fd1fd94d19b75ce
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
The README in "balance-transfer" should be fixed in the section:
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#running-the-sample-program
1. Broken link
There is a link to "Sample REST APIs Requests" which is broken.
This is linked to non-existent path on fabric-sdk-node repository.
I believe the intended link is to
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#sample-rest-apis-requests
2. Instruction to start node application.
There is no instruction to start node application.
If we execute the REST APIs according to the current README,
we can't get any responses since node application is not working.
We need to execute the following steps before calling REST APIs.
- npm install
- PORT=4000 node app
fix repo names
Change-Id: I9ec0ec18bb36addd6c8371481dc8cfe645053ec6
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Sample should use 'fcn' not 'functionName'
in the sample curl calls and sample app.
Change-Id: I4be92a0394fdf579195e9566d049aac0862d5888
Signed-off-by: Bret Harrison <beharrison@nc.rr.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>
"balance-transfer" app doesn't check all of the proposal responses.
An app sends a transaction proposal to multiple peers and get
multiple responses. However, the only first response
"proposalResponses[0]" is checked repeatedly in the loop.
This patch fixes the code to check all of the array value of
proposalResponses correctly.
Change-Id: Id61e691eb4d1c3a6c4a7a390584dfd74f1fc6196
Signed-off-by: Yuki Kondo <yuki.kondo@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>
