From 36694d08e598e270b77fcbbc3e54719a7e1ff96f Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Wed, 20 Nov 2019 15:53:22 -0800 Subject: [PATCH] [FAB-17121] Use new bootstrap config in orderer It includes two config changes in fabric recently: * GenesisMethod --> BootstrapMethod * GenesisFile --> BootstrapFile Signed-off-by: Baohua Yang Signed-off-by: Baohua Yang --- basic-network/docker-compose.yml | 4 ++-- chaincode-docker-devmode/docker-compose-simple.yaml | 4 ++-- first-network/base/peer-base.yaml | 4 ++-- interest_rate_swaps/network/docker-compose.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basic-network/docker-compose.yml b/basic-network/docker-compose.yml index 1d3ae5c0f1..6f97c7e20a 100644 --- a/basic-network/docker-compose.yml +++ b/basic-network/docker-compose.yml @@ -31,8 +31,8 @@ services: environment: - FABRIC_LOGGING_SPEC=info - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/etc/hyperledger/configtx/genesis.block + - ORDERER_GENERAL_BOOTSTRAPMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/etc/hyperledger/configtx/genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp/orderer/msp working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer diff --git a/chaincode-docker-devmode/docker-compose-simple.yaml b/chaincode-docker-devmode/docker-compose-simple.yaml index db46c56a5d..076b605198 100644 --- a/chaincode-docker-devmode/docker-compose-simple.yaml +++ b/chaincode-docker-devmode/docker-compose-simple.yaml @@ -7,8 +7,8 @@ services: environment: - FABRIC_LOGGING_SPEC=debug - ORDERER_GENERAL_LISTENADDRESS=orderer - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=orderer.block + - ORDERER_GENERAL_BOOTSTRAPMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=orderer.block - ORDERER_GENERAL_LOCALMSPID=DEFAULT - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp - GRPC_TRACE=all=true, diff --git a/first-network/base/peer-base.yaml b/first-network/base/peer-base.yaml index 9b867084e9..11dc8a7337 100644 --- a/first-network/base/peer-base.yaml +++ b/first-network/base/peer-base.yaml @@ -33,8 +33,8 @@ services: environment: - FABRIC_LOGGING_SPEC=INFO - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block + - ORDERER_GENERAL_BOOTSTRAPMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/orderer/orderer.genesis.block - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp # enabled TLS diff --git a/interest_rate_swaps/network/docker-compose.yaml b/interest_rate_swaps/network/docker-compose.yaml index 44fabf961d..371ef0481d 100644 --- a/interest_rate_swaps/network/docker-compose.yaml +++ b/interest_rate_swaps/network/docker-compose.yaml @@ -35,8 +35,8 @@ services: environment: - FABRIC_LOGGING_SPEC=INFO - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block + - ORDERER_GENERAL_BOOTSTRAPMETHOD=file + - ORDERER_GENERAL_BOOTSTRAPFILE=/var/hyperledger/orderer/orderer.genesis.block - ORDERER_GENERAL_LOCALMSPID=orderer - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - ORDERER_GENERAL_TLS_ENABLED=false