This CR updates the first-network (BYFN and EYFN) to use an
'AND (...)' endorsement policy. It also cleans up some of the
output and fixes the line length of some comments.
Change-Id: I741f41226955ccfcd3eb5369d8ba6eb77e49e89e
Signed-off-by: Will Lahti <wtlahti@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: I80b36a63370065a7aad0f9c284ec578533123d2b
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
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>
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>
A number of the image lines in the compose files were skipped when the
IMAGE_TAG option was added. This CR fixes them.
Change-Id: I60ca932de47315f2c99368ac41ed6710aca96614
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
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>
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>
