From f6aae6f49f3a661c8ec6c2a2dadd49b40f7d53a9 Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Fri, 13 Dec 2019 13:00:41 -0800 Subject: [PATCH] Check bridge existence when start --- hyperledger_fabric/latest/Makefile | 4 ++-- hyperledger_fabric/v1.4.4/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hyperledger_fabric/latest/Makefile b/hyperledger_fabric/latest/Makefile index 61db85cb..165b75d9 100644 --- a/hyperledger_fabric/latest/Makefile +++ b/hyperledger_fabric/latest/Makefile @@ -42,8 +42,6 @@ test: ready: # create/join channel, install/instantiate cc make stop - @echo "Make sure the local hlf_net docker bridge exists" - docker network ls|grep hlf_net > /dev/null || docker network create hlf_net # make clean_config_channel # Remove existing channel artifacts make gen_config_crypto # Will ignore if local config path exists @@ -91,6 +89,8 @@ restart: stop start start: # bootup the fabric network @echo "Start a fabric network with ${COMPOSE_FILE}..." @make clean + @echo "Make sure the local hlf_net docker bridge exists" + docker network ls|grep hlf_net > /dev/null || docker network create hlf_net @docker-compose -f ${COMPOSE_FILE} up -d # Start a fabric network stop: # stop the fabric network diff --git a/hyperledger_fabric/v1.4.4/Makefile b/hyperledger_fabric/v1.4.4/Makefile index 976a058d..08b686d9 100644 --- a/hyperledger_fabric/v1.4.4/Makefile +++ b/hyperledger_fabric/v1.4.4/Makefile @@ -42,8 +42,6 @@ test: ready: # create/join channel, install/instantiate cc make stop - @echo "Make sure the local hlf_net docker bridge exists" - docker network ls|grep hlf_net > /dev/null || docker network create hlf_net # make clean_config_channel # Remove existing channel artifacts make gen_config_crypto # Will ignore if local config path exists @@ -91,6 +89,8 @@ restart: stop start start: # bootup the fabric network @echo "Start a fabric network with ${COMPOSE_FILE}..." @make clean + @echo "Make sure the local hlf_net docker bridge exists" + docker network ls|grep hlf_net > /dev/null || docker network create hlf_net @docker-compose -f ${COMPOSE_FILE} up -d # Start a fabric network stop: # stop the fabric network