Merge pull request #45 from qiang0723/master

Enable start with 2 orgs and 4 peers
2017-05-13 10:41:14 +08:00 · 2017-05-13 10:41:14 +08:00 · 5d3bebab77
parent 414580f756 2f577dcf57
commit 5d3bebab77
2 changed files with 158 additions and 51 deletions
--- a/hyperledger/1.0/docker-compose-new-channel.yml
+++ b/hyperledger/1.0/docker-compose-new-channel.yml
@ -18,61 +18,34 @@ 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
-    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
+    extends:
+      file: peer-base.yml
+      service: orderer.example.com

  peer0.org1.example.com:
    extends:
-      file: peer.yml
-      service: peer
+      file: peer-base.yml
+      service: peer0.org1.example.com
    container_name: peer0.org1.example.com
-    hostname: 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
+
+  peer1.org1.example.com:
+    extends:
+      file: peer-base.yml
+      service: peer1.org1.example.com
+    container_name: peer1.org1.example.com
+
+  peer0.org2.example.com:
+    extends:
+      file: peer-base.yml
+      service: peer0.org2.example.com
+    container_name: peer0.org2.example.com
+
+  peer1.org2.example.com:
+    extends:
+      file: peer-base.yml
+      service: peer1.org2.example.com
+    container_name: peer1.org2.example.com

  cli:
    extends:
@ -101,8 +74,11 @@ services:
        - ./e2e_cli/configtx.yaml:/opt/gopath/src/github.com/hyperledger/fabric/peer/configtx.yaml
        - ./e2e_cli/crypto-config.yaml:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto-config.yaml
    depends_on:
-      - peer0.org1.example.com
      - orderer.example.com
+      - peer0.org1.example.com
+      - peer1.org1.example.com
+      - peer0.org2.example.com
+      - peer1.org2.example.com
    command: bash -c 'while true; do sleep 20170504; done'

 #networks:
--- a/hyperledger/1.0/peer-base.yml
+++ b/hyperledger/1.0/peer-base.yml
@ -0,0 +1,131 @@
+version: '2'
+
+services:
+
+  orderer.example.com:  # There  can be multiple orderers
+    image: hyperledger/fabric-orderer
+    container_name: orderer.example.com
+    hostname: 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
+
+  peer0.org1.example.com:
+    extends:
+      file: peer.yml
+      service: peer
+    container_name: peer0.org1.example.com
+    hostname: peer0.org1.example.com
+    environment:
+      - CORE_PEER_ID=peer0.org1.example.com
+      - CORE_PEER_ADDRESS=peer0.org1.example.com: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
+    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
+    command: peer node start --peer-defaultchain=false
+
+  peer1.org1.example.com:
+    extends:
+      file: peer.yml
+      service: peer
+    container_name: peer1.org1.example.com
+    hostname: peer1.org1.example.com
+    environment:
+      - CORE_PEER_ID=peer1.org1.example.com
+      - CORE_PEER_ADDRESS=peer1.org1.example.com:7051
+      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org1.example.com:7051
+      - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051
+      - CORE_PEER_LOCALMSPID=Org1MSP
+      - CORE_PEER_GOSSIP_ORGLEADER=true
+      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer.example.com:7050
+      - 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
+    ports:
+      - 8051:7051
+      - 8053:7053
+    volumes:
+        - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp
+        - ./e2e_cli/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls
+    command: peer node start --peer-defaultchain=false
+
+  peer0.org2.example.com:
+    extends:
+      file: peer.yml
+      service: peer
+    container_name: peer0.org2.example.com
+    hostname: peer0.org2.example.com
+    environment:
+      - CORE_PEER_ID=peer0.org2.example.com
+      - CORE_PEER_ADDRESS=peer0.org2.example.com:7051
+      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:7051
+      - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051
+      - CORE_PEER_LOCALMSPID=Org2MSP
+      - CORE_PEER_GOSSIP_ORGLEADER=true
+      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer.example.com:7050
+      - 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
+    ports:
+      - 9051:7051
+      - 9053:7053
+    volumes:
+        - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp
+        - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls
+    command: peer node start --peer-defaultchain=false
+
+  peer1.org2.example.com:
+    extends:
+      file: peer.yml
+      service: peer
+    container_name: peer1.org2.example.com
+    hostname: peer1.org2.example.com
+    environment:
+      - CORE_PEER_ID=peer1.org2.example.com
+      - CORE_PEER_ADDRESS=peer1.org2.example.com:7051
+      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org2.example.com:7051
+      - CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051
+      - CORE_PEER_LOCALMSPID=Org2MSP
+      - CORE_PEER_GOSSIP_ORGLEADER=true
+      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer.example.com:7050
+      - 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
+    ports:
+      - 10051:7051
+      - 10053:7053
+    volumes:
+        - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp
+        - ./e2e_cli/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls
+    command: peer node start --peer-defaultchain=false