Update compose file name

2017-05-13 10:42:50 +08:00 · 2017-05-13 10:42:50 +08:00 · b968e17e86
parent 5d3bebab77
commit b968e17e86
2 changed files with 138 additions and 27 deletions
--- a/hyperledger/1.0/docker-compose-2orgs.yml
+++ b/hyperledger/1.0/docker-compose-2orgs.yml
@ -0,0 +1,87 @@
+# 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
+
+version: '2.0'
+
+services:
+  ca:
+    image: hyperledger/fabric-ca
+    container_name: fabric-ca
+    hostname: ca
+  #  command: /go/src/github.com/hyperledger/fabric-ca/bin/ca server start -ca testdata/ec.pem -ca-key testdata/ec-key.pem -config testdata/testconfig.json
+    ports:
+      - "8888:8888"
+    command: fabric-ca-server start -b admin:adminpw
+
+  orderer.example.com:  # There  can be multiple orderers
+    container_name: orderer.example.com
+    extends:
+      file: peer-base.yml
+      service: orderer.example.com
+
+  peer0.org1.example.com:
+    extends:
+      file: peer-base.yml
+      service: peer0.org1.example.com
+    container_name: peer0.org1.example.com
+
+  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:
+      file: peer.yml
+      service: peer
+    container_name: fabric-cli
+    hostname: cli
+    environment:
+      - CORE_PEER_ID=cli
+      - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
+      - 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/
+        - ./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/peer/configtx.yaml
+        - ./e2e_cli/crypto-config.yaml:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto-config.yaml
+    depends_on:
+      - 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:
+#  default:
+#    external:
+#      name: hyperledger_fabric
--- a/hyperledger/1.0/docker-compose-new-channel.yml
+++ b/hyperledger/1.0/docker-compose-new-channel.yml
@ -18,34 +18,61 @@ 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
-    extends:
-      file: peer-base.yml
-      service: 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-base.yml
-      service: peer0.org1.example.com
+      file: peer.yml
+      service: peer
    container_name: peer0.org1.example.com
-
-  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
+    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

  cli:
    extends:
@ -74,11 +101,8 @@ 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:
-      - orderer.example.com
      - peer0.org1.example.com
-      - peer1.org1.example.com
-      - peer0.org2.example.com
-      - peer1.org2.example.com
+      - orderer.example.com
    command: bash -c 'while true; do sleep 20170504; done'

 #networks: