Merge pull request #1 from lafenicecc/master

Update hyperledger/compose-defaults.yml with latest hyperledger code
pull/2/head
yeasy 2016-05-06 16:03:15 +08:00
commit a01fcaa577
1 changed files with 4 additions and 4 deletions

View File

@ -2,21 +2,21 @@
# Notice that chaincode is executed inside docker in default net mode # Notice that chaincode is executed inside docker in default net mode
# https://github.com/yeasy/docker-compose-files # https://github.com/yeasy/docker-compose-files
# Depends on the yeasy/hyperledger-peer:latest image # Depends on the yeasy/hyperledger-peer:pbft image
# If you want enable consensus, just uncomment the # If you want enable consensus, just uncomment the
# CORE_PEER_VALIDATOR_CONSENSUE=obcpbft line # CORE_PEER_VALIDATOR_CONSENSUE=obcpbft line
# See https://github.com/hyperledger/fabric/blob/master/docs/dev-setup/devnet-setup.md#using-consensus-plugin for more details. # See https://github.com/hyperledger/fabric/blob/master/docs/dev-setup/devnet-setup.md#using-consensus-plugin for more details.
vp: vp:
image: yeasy/hyperledger-peer:latest image: yeasy/hyperledger-peer:pbft
restart: unless-stopped restart: unless-stopped
environment: environment:
- CORE_PEER_ADDRESSAUTODETECT=true - CORE_PEER_ADDRESSAUTODETECT=true
- CORE_PEER_NETWORKID=dev - CORE_PEER_NETWORKID=dev
- CORE_LOGGING_LEVEL=debug #critical, error, warning, notice, info, debug - CORE_LOGGING_LEVEL=debug #critical, error, warning, notice, info, debug
# The following section enables bpft consensus # The following section enables pbft consensus
- CORE_PEER_VALIDATOR_CONSENSUS=pbft # noops, obcpbft, pbft - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft # noops, obcpbft, pbft
- CORE_PBFT_GENERAL_MODE=classic # batch, classic, sieve - CORE_PBFT_GENERAL_MODE=classic # batch, classic, sieve
- CORE_PBFT_GENERAL_N=4 - CORE_PBFT_GENERAL_N=4
- CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s