The test-network peer configuration specifies $(TWO_DIGIT_VERSION) as
the tag for the Node and Java chaincode containers. For Fabric v3.0,
this requests fabric-nodeenv:3.0 and fabric-javaenv:3.0 Docker images to
host Node and Java chaincode respectively. These images do not exist,
which causes deployment of Node and Java chaincode to fail when using
Fabric v3.0. Fabric v3.0 continues to use fabric-nodeenv:2.5 and
fabric-javaenv:2.5.
This change updates the test-network peer configuration to explicitly
specify `2.5` as the Node and Java chaincode Docker image tags. This is
(currently) the correct version for both Fabric v2.5 and Fabric v3.0.
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
This patch improves prereqs logic in test-network-k8s.
- Use the newer install script instead of bootstrap.sh
- Download binaries matching the Docker image versions, instead of the latest version
- Add checks for Fabric versions to ensure consistency between images and binaries
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
With removal of fabric-tools image, test-network
now depends on jq being installed locally.
This commit logs an error message if jq commands
fail due to jq not being installed locally.
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
This patch aims to refactor the test-network in several aspects,
following the decoupling of the fabric-tools image from fabric-samples.
- Rename 'test_network_home' env var to 'TEST_NETWORK_HOME'
- Dedicate the intermediate artifacts related to configtx to
channel-artifacts
- Refer to core.yaml in fabric-samples/config, similar to org1 and 2,
instead of adding a new core file
- Remove unnecessary functions and comments for CLI container
- Other minor modifications
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
Change shell script to use single equals.
In my shell environment single bracket with double equals did not work.
It caused failure when running the chaincode-external tutorial README.
It looks like for maximum portability, it is best to use single bracket with single equals.
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
* add support for docker compose v2 (fix#730)
Signed-off-by: uniform64 <jiny2048@gmail.com>
* add support for docker compose v2 (fix#730)
some missing places in the previous commit
Signed-off-by: uniform64 <jiny2048@gmail.com>
---------
Signed-off-by: uniform64 <jiny2048@gmail.com>
Resolves a regression introduced in e73bb717db.
Previous change defaulted to "auto" as the sequence number but omitted the call to generate the correct sequence number for the "auto" value. This resulted in "auto" being used as the sequence number, which is an error since an integer is required.
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
This change is meant to help cover end user functionality
that was previously covered by the blockchain VSCode Plugin.
Functions added:
- cc mode with package, list chaincode, invoke and query functions
- auto sequencing for chaincode deployment
- move variables into config file
Signed-off-by: Chris Elder <celder@Chriss-MacBook-Air.local>
This patch fixes the description of orderer2-4 in OrdererEndpoints
in test-network's bft-config/configtx.yaml.
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
This patch includes:
- Fixed a minor bug in the parsing of the BFT flag
- Added check for when a user attempts to use BFT orderer in
Fabric network with CA
- Update of printHelp for use of the BFT flag
- Fixed explanations
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
Added a new option for creating channel:
Running ./network.sh createChannel -bft will initiate a channel running BFT orderers.
Using ./network.sh up -bft will initiate dockers for bft environment.
Added option for 4 orderers.
Add add_new_orderer_to_config.py which is referenced in the fabric official docs.
Signed-off-by: Arkadi Piven <arkadi.piven@ibm.com>
Signed-off-by: arkadipiven <arkadi7770@gmail.com>
Flag --csr.hosts is only relevant for tls enrollments, it adds the SAN to the TLS cert.
For msp enrollments, the cert is only used for identity, therefore there is no need for SAN and no need to pass --csr.hosts.
Having --csr.hosts for msp enrollments is misleading, this commit removes it.
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
* Add in examples and notes on using PurgePrivateData
- Update the configtx.yaml to enable the 2.5 capabillity
- Added purge into the chancode
- Added pruge into the application client code.
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
* Temporarily remove java cc test
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
Correctly check for installed chaincode and enable the same chaincode to be deployed on different channels
Signed-off-by: James Taylor <jamest@uk.ibm.com>
Signed-off-by: James Taylor <jamest@uk.ibm.com>
This change fixes a few minor errors and adds a note to help the user.
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
This change updates the test-network README with up-to-date information
about using podman on Mac and improves support for podman in deployCCAAS.sh
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
This PR fixes the followings to run the tutorial.
- Add an instruction to set PATH to call the `peer` command.
- Correct an option for `deployCCAAS` to debug Chaincode.
Signed-off-by: Yuki Kondo <yuki.kondo.ob@hitachi.com>
* check if running
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
* fix indent
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
better detection in create channel
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
bring network down first case
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
bring network down first case
changed count of containers to 4
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
add echo
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
typo
Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
Co-authored-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
* Experimental Support for using podman with the test-network
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
* supplement podman with nerdctl
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
* adds experimental support for nerdctl compose
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
* install fabric images to containerd with 'nerdctl' pull
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
* Podman Support
Use a core set of compose files, with overlays for specific details.
In the case of podman, the overlays refer to a specific core.yaml for the peer that distables the use of teh
docker daemon
In the case of docker, the overlays add enable the docker daemon accesss for the peer to create chaincode
containers
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
The network.sh is dependent onbeing executed from the test-network directory
This PR makes it a little more tolerant, and will add a bin directgory based on the location
of the script - not just the PWD
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
- removed unused overrides
- addressed issue using $__interval which doesn't work as well as
$interval
- addressed issue where multiple channels may not give correct output
Signed-off-by: D <d_kelsey@uk.ibm.com>
Co-authored-by: D <d_kelsey@uk.ibm.com>
Although test network scripts functionally worked, they demonstrated
some strange patterns around use of the ca cert.
This change makes it clear that the ca cert is configured and used
at the org level, and not related to any individual peer or orderer node.
Also that when connecting to individual servers, clients can pass the
org level CA cert as the root of trust when establishing TLS connections.
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
Also fix the version of prometheus and grafana being used
to ensure the queries remain compatible as well as avoid
issues whether they may not work if latest images already
exist on machine but are not at a level that will work
Signed-off-by: D <d_kelsey@uk.ibm.com>
Co-authored-by: D <d_kelsey@uk.ibm.com>
This fixes several typos and more importantly add an instruction to
set FABRIC_CFG_PATH without which the peer command fails.
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
