Skip to content

Commit

Permalink
[FAB-5576] -f flag to choose docker-compose on byfn.sh
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
dsanchezseco committed Aug 3, 2017
1 parent 6b99925 commit 5921140
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion first-network/byfn.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export FABRIC_CFG_PATH=${PWD}
# Print the usage message
function printHelp () {
echo "Usage: "
echo " byfn.sh -m up|down|restart|generate [-c <channel name>] [-t <timeout>] [-d <delay>] "
echo " byfn.sh -m up|down|restart|generate [-c <channel name>] [-t <timeout>] [-d <delay>] [-f <docker-compose-file>]"
echo " byfn.sh -h|--help (print this message)"
echo " -m <mode> - one of 'up', 'down', 'restart' or 'generate'"
echo " - 'up' - bring up the network with docker-compose up"
Expand All @@ -44,6 +44,7 @@ function printHelp () {
echo " -c <channel name> - channel name to use (defaults to \"mychannel\")"
echo " -t <timeout> - CLI timeout duration in microseconds (defaults to 10000)"
echo " -d <delay> - delay duration in seconds (defaults to 3)"
echo " -f <docker-compose-file> - specify which docker-compose file use (defaults to docker-compose-cli.yaml)"
echo
echo "Typically, one would first generate the required certificates and "
echo "genesis block, then bring up the network. e.g.:"
Expand Down Expand Up @@ -318,6 +319,8 @@ while getopts "h?m:c:t:d:" opt; do
;;
d) CLI_DELAY=$OPTARG
;;
f) COMPOSE_FILE=$OPTARG
;;
esac
done

Expand Down

0 comments on commit 5921140

Please sign in to comment.