diff --git a/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-couchdb.yaml b/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-couchdb.yaml index 2a72db46..a59c4302 100644 --- a/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-couchdb.yaml +++ b/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-couchdb.yaml @@ -17,12 +17,12 @@ version: '2' services: orderer.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: orderer.example.com peer0.org1.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer0.org1.example.com environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB @@ -32,7 +32,7 @@ services: peer1.org1.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer1.org1.example.com environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB @@ -42,7 +42,7 @@ services: peer0.org2.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer0.org2.example.com environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB @@ -52,7 +52,7 @@ services: peer1.org2.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer1.org2.example.com environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB @@ -102,6 +102,6 @@ services: cli: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: cli diff --git a/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-event.yaml b/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-event.yaml index 35b41456..d74cfeca 100644 --- a/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-event.yaml +++ b/hyperledger_fabric/1.0.0/docker-compose-2orgs-4peers-event.yaml @@ -19,27 +19,27 @@ services: orderer.example.com: # There can be multiple orderers extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: orderer.example.com peer0.org1.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer0.org1.example.com peer1.org1.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer1.org1.example.com peer0.org2.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer0.org2.example.com peer1.org2.example.com: extends: - file: docker-compose-base-e2e.yaml + file: docker-compose-base.yaml service: peer1.org2.example.com cli: diff --git a/hyperledger_fabric/1.0.0/docker-compose.yaml b/hyperledger_fabric/1.0.0/docker-compose.yaml deleted file mode 100644 index b6f8de2a..00000000 --- a/hyperledger_fabric/1.0.0/docker-compose.yaml +++ /dev/null @@ -1,77 +0,0 @@ -# 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 - -# all peers will join the default testchainid channel after bootup - -version: '2.0' - -services: - ca: - image: yeasy/hyperledger-fabric-ca:1.0.1 - 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: - - "7054:7054" - command: fabric-ca-server start -b admin:adminpw - - orderer0: # There can be multiple orderers - image: yeasy/hyperledger-fabric-orderer:1.0.1 - container_name: fabric-orderer0 - hostname: orderer0 - environment: - - ORDERER_GENERAL_LEDGERTYPE=file - - ORDERER_GENERAL_BATCHTIMEOUT=10s - - ORDERER_GENERAL_MAXMESSAGECOUNT=10 - - ORDERER_GENERAL_MAXWINDOWSIZE=1000 - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_LISTENPORT=7050 - - ORDERER_RAMLEDGER_HISTORY_SIZE=100 - - CONFIGTX_ORDERER_ORDERERTYPE=solo - ports: - - "7050:7050" - command: orderer - - peer0: - extends: - file: peer-base.yaml - service: peer - container_name: fabric-peer0 - hostname: peer0 - environment: - - CORE_PEER_ID=peer0 - - CORE_PEER_GOSSIP_ORGLEADER=true - links: - - orderer0 - ports: - - 7051:7051 - depends_on: - - orderer0 - command: peer node start -o orderer0:7050 - - cli: - extends: - file: peer-base.yaml - service: peer - container_name: fabric-cli - hostname: cli - environment: - - CORE_PEER_ID=cli - - CORE_PEER_ADDRESS=peer0:7051 - #- CORE_PEER_LOCALMSPID=Org0MSP - links: - - peer0 - - orderer0 - depends_on: - - peer0 - - orderer0 - command: bash -c 'while true; do sleep 20170504; done' - -#networks: -# default: -# external: -# name: hyperledger_fabric diff --git a/hyperledger_fabric/1.0.4/docker-compose-2orgs-4peers-event.yaml b/hyperledger_fabric/1.0.4/docker-compose-2orgs-4peers-event.yaml index c085d7e0..5c4efd0d 100644 --- a/hyperledger_fabric/1.0.4/docker-compose-2orgs-4peers-event.yaml +++ b/hyperledger_fabric/1.0.4/docker-compose-2orgs-4peers-event.yaml @@ -18,21 +18,29 @@ services: extends: file: base-event.yaml service: peer0.org1.example.com + depends_on: + - orderer.example.com peer1.org1.example.com: extends: file: base-event.yaml service: peer1.org1.example.com + depends_on: + - orderer.example.com peer0.org2.example.com: extends: file: base-event.yaml service: peer0.org2.example.com + depends_on: + - orderer.example.com peer1.org2.example.com: extends: file: base-event.yaml service: peer1.org2.example.com + depends_on: + - orderer.example.com cli: extends: @@ -49,4 +57,3 @@ services: - peer1.org1.example.com - peer0.org2.example.com - peer1.org2.example.com - command: bash -c 'while true; do sleep 20170504; done' \ No newline at end of file