From b19816b6279dd2bc56982fb6d3d988209b7a9c28 Mon Sep 17 00:00:00 2001 From: Bob Dill Date: Tue, 15 Aug 2017 10:13:52 -0400 Subject: [PATCH] updated byfn.sh to pass DELAY to docker compose in networkUp exec (first network). ran dos2unix against byfn.sh, script.sh, fabric-preload.sh to make them executable --- first-network/byfn.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/first-network/byfn.sh b/first-network/byfn.sh index e335fd00..aa8c988f 100755 --- a/first-network/byfn.sh +++ b/first-network/byfn.sh @@ -110,11 +110,11 @@ function networkUp () { replacePrivateKey generateChannelArtifacts fi - CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT DELAY=$CLI_DELAY docker-compose -f $COMPOSE_FILE up -d 2>&1 +# CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT DELAY=$CLI_DELAY docker-compose -f $COMPOSE_FILE up -d 2>&1 if [ "${IF_COUCHDB}" == "couchdb" ]; then - CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH up -d 2>&1 + CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT DELAY=$CLI_DELAY docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH up -d 2>&1 else - CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT docker-compose -f $COMPOSE_FILE up -d 2>&1 + CHANNEL_NAME=$CHANNEL_NAME TIMEOUT=$CLI_TIMEOUT DELAY=$CLI_DELAY docker-compose -f $COMPOSE_FILE up -d 2>&1 fi if [ $? -ne 0 ]; then echo "ERROR !!!! Unable to start network"