From a080da3e23bbac5a8d251e08e91ebc10fcf40080 Mon Sep 17 00:00:00 2001 From: Salman Baset Date: Mon, 26 Mar 2018 10:18:01 -0400 Subject: [PATCH] [FAB-8958] Add org3 removal to byfn.sh When running the sample "Adding an Org to a Channel", then upon clean up, ./eyfn.sh -m down script must be run before ./byfn.sh -m down; otherwise, org3 containers and volumes and containers do not get cleaned properly. This patch adds the org3 container and volume cleanup to ./byfn.sh so that a user does not have to worry about the correct execution ordering of ./eyfn.sh and ./byfn.sh scripts. Change-Id: Ieac1adc4081d59943286cfe9139a74395986460b Signed-off-by: Salman Baset --- first-network/byfn.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/first-network/byfn.sh b/first-network/byfn.sh index 0e68afc46d..73db136b1c 100755 --- a/first-network/byfn.sh +++ b/first-network/byfn.sh @@ -232,8 +232,10 @@ function upgradeNetwork () { # Tear down running network function networkDown () { - docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH down --volumes - docker-compose -f $COMPOSE_FILE down --volumes + # stop org3 containers also in addition to org1 and org2, in case we were running sample to add org3 + docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_COUCH -f $COMPOSE_FILE_ORG3 down --volumes + docker-compose -f $COMPOSE_FILE -f $COMPOSE_FILE_ORG3 down --volumes + # Don't remove the generated artifacts -- note, the ledgers are always removed if [ "$MODE" != "restart" ]; then # Bring down the network, deleting the volumes @@ -440,6 +442,9 @@ CHANNEL_NAME="mychannel" COMPOSE_FILE=docker-compose-cli.yaml # COMPOSE_FILE_COUCH=docker-compose-couch.yaml +# org3 docker compose file +COMPOSE_FILE_ORG3=docker-compose-org3.yaml +# # use golang as the default language for chaincode LANGUAGE=golang # default image tag