From 604e02174b4edc1aff877b7cb2b5649921b990f2 Mon Sep 17 00:00:00 2001 From: qiang0723 Date: Fri, 16 Jun 2017 15:56:25 +0800 Subject: [PATCH] Modify docker-compose-1peer.yaml --- hyperledger/1.0/docker-compose-1peer.yaml | 91 ++++++----------------- 1 file changed, 23 insertions(+), 68 deletions(-) diff --git a/hyperledger/1.0/docker-compose-1peer.yaml b/hyperledger/1.0/docker-compose-1peer.yaml index 314cf5bd..26de82fd 100644 --- a/hyperledger/1.0/docker-compose-1peer.yaml +++ b/hyperledger/1.0/docker-compose-1peer.yaml @@ -1,9 +1,9 @@ # https://github.com/yeasy/docker-compose-files/tree/master/hyperledger # This compose file will start a Hyperledger Fabric 1.0 MVE, including -# * ca -# * orderer -# * peer -# * sdk for testing +# * 1 ca +# * 1 orderer +# * 1 peers in 1 orgs +# * cli for testing version: '2.0' @@ -18,92 +18,47 @@ services: command: fabric-ca-server start -b admin:adminpw orderer.example.com: # There can be multiple orderers - image: hyperledger/fabric-orderer - container_name: orderer.example.com - hostname: orderer.example.com + extends: + file: docker-compose-base.yaml + service: orderer.example.com environment: - - ORDERER_GENERAL_LOGLEVEL=INFO - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block #Need to be confirm orderer.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/var/hyperledger/orderer/msp - - ORDERER_GENERAL_LEDGERTYPE=ram - - ORDERER_GENERAL_BATCHTIMEOUT=10s - - ORDERER_GENERAL_MAXMESSAGECOUNT=10 - - ORDERER_GENERAL_MAXWINDOWSIZE=1000 - - ORDERER_GENERAL_LISTENPORT=7050 - - ORDERER_RAMLEDGER_HISTORY_SIZE=100 - - ORDERER_GENERAL_TLS_ENABLED=false # to enable TLS, make this true - - ORDERER_GENERAL_TLS_PRIVATEKEY=/var/hyperledger/orderer/tls/server.key - - ORDERER_GENERAL_TLS_CERTIFICATE=/var/hyperledger/orderer/tls/server.crt - - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] - ports: - - "7050:7050" - volumes: - - ./e2e_cli/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block - - ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp - - ./e2e_cli/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls - command: orderer + - ORDERER_GENERAL_TLS_ENABLED=false peer0.org1.example.com: extends: - file: peer-base.yaml - service: peer-base - container_name: peer0.org1.example.com - hostname: peer0.org1.example.com + file: docker-compose-base.yaml + service: peer0.org1.example.com environment: - - CORE_PEER_ID=peer0.org1.example.com - - CORE_PEER_ADDRESS=peer0.org1:7051 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051 - # - CORE_PEER_GOSSIP_ORGLEADER=true - # - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer.example.com:7050 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt - - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key - - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt - links: - - orderer.example.com - ports: - - 7051:7051 - - 7053:7053 - volumes: - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp - - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls - depends_on: - - orderer.example.com - command: peer node start --peer-defaultchain=false + - CORE_PEER_TLS_ENABLED=false cli: - extends: - file: peer-base.yaml - service: peer-base container_name: fabric-cli - hostname: cli + hostname: fabric-cli + image: hyperledger/fabric-tools + tty: true environment: - - CORE_PEER_ID=cli - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 + - CORE_PEER_ID=fabric-cli + - CORE_LOGGING_LEVEL=DEBUG + - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1 - CORE_PEER_LOCALMSPID=Org1MSP - #- CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:7050 - CORE_PEER_TLS_ENABLED=false # to enable TLS, change to true - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp - links: - - peer0.org1.example.com - - orderer.example.com volumes: #- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - - ./e2e_cli/crypto-config:/etc/hyperledger/fabric/crypto-config - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - ./e2e_cli/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts - - ./e2e_cli/configtx.yaml:/opt/gopath/src/github.com/hyperledger/fabric/configtx.yaml - - ./e2e_cli/crypto-config.yaml:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto-config.yaml + - ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml + - ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml depends_on: - - peer0.org1.example.com - orderer.example.com + - peer0.org1.example.com + links: + - orderer.example.com + - peer0.org1.example.com working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer command: bash -c 'while true; do sleep 20170504; done'