From 592114010ec6ee747090c6398840fafbae7daf33 Mon Sep 17 00:00:00 2001 From: dsanchezseco Date: Thu, 3 Aug 2017 12:18:50 +0200 Subject: [PATCH] [FAB-5576] -f flag to choose docker-compose on byfn.sh 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 --- first-network/byfn.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/first-network/byfn.sh b/first-network/byfn.sh index ffcc5392bc..d2d2af517c 100755 --- a/first-network/byfn.sh +++ b/first-network/byfn.sh @@ -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 ] [-t ] [-d ] " + echo " byfn.sh -m up|down|restart|generate [-c ] [-t ] [-d ] [-f ]" echo " byfn.sh -h|--help (print this message)" echo " -m - one of 'up', 'down', 'restart' or 'generate'" echo " - 'up' - bring up the network with docker-compose up" @@ -44,6 +44,7 @@ function printHelp () { echo " -c - channel name to use (defaults to \"mychannel\")" echo " -t - CLI timeout duration in microseconds (defaults to 10000)" echo " -d - delay duration in seconds (defaults to 3)" + echo " -f - 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.:" @@ -318,6 +319,8 @@ while getopts "h?m:c:t:d:" opt; do ;; d) CLI_DELAY=$OPTARG ;; + f) COMPOSE_FILE=$OPTARG + ;; esac done