Fix #104: Remove unused files

pull/108/head
Baohua Yang 2017-11-03 16:41:57 +08:00
parent c485d7a820
commit 95dd1431e2
4 changed files with 19 additions and 89 deletions

View File

@ -17,12 +17,12 @@ version: '2'
services: services:
orderer.example.com: orderer.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: orderer.example.com service: orderer.example.com
peer0.org1.example.com: peer0.org1.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer0.org1.example.com service: peer0.org1.example.com
environment: environment:
- CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
@ -32,7 +32,7 @@ services:
peer1.org1.example.com: peer1.org1.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer1.org1.example.com service: peer1.org1.example.com
environment: environment:
- CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
@ -42,7 +42,7 @@ services:
peer0.org2.example.com: peer0.org2.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer0.org2.example.com service: peer0.org2.example.com
environment: environment:
- CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
@ -52,7 +52,7 @@ services:
peer1.org2.example.com: peer1.org2.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer1.org2.example.com service: peer1.org2.example.com
environment: environment:
- CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
@ -102,6 +102,6 @@ services:
cli: cli:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: cli service: cli

View File

@ -19,27 +19,27 @@ services:
orderer.example.com: # There can be multiple orderers orderer.example.com: # There can be multiple orderers
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: orderer.example.com service: orderer.example.com
peer0.org1.example.com: peer0.org1.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer0.org1.example.com service: peer0.org1.example.com
peer1.org1.example.com: peer1.org1.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer1.org1.example.com service: peer1.org1.example.com
peer0.org2.example.com: peer0.org2.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer0.org2.example.com service: peer0.org2.example.com
peer1.org2.example.com: peer1.org2.example.com:
extends: extends:
file: docker-compose-base-e2e.yaml file: docker-compose-base.yaml
service: peer1.org2.example.com service: peer1.org2.example.com
cli: cli:

View File

@ -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

View File

@ -18,21 +18,29 @@ services:
extends: extends:
file: base-event.yaml file: base-event.yaml
service: peer0.org1.example.com service: peer0.org1.example.com
depends_on:
- orderer.example.com
peer1.org1.example.com: peer1.org1.example.com:
extends: extends:
file: base-event.yaml file: base-event.yaml
service: peer1.org1.example.com service: peer1.org1.example.com
depends_on:
- orderer.example.com
peer0.org2.example.com: peer0.org2.example.com:
extends: extends:
file: base-event.yaml file: base-event.yaml
service: peer0.org2.example.com service: peer0.org2.example.com
depends_on:
- orderer.example.com
peer1.org2.example.com: peer1.org2.example.com:
extends: extends:
file: base-event.yaml file: base-event.yaml
service: peer1.org2.example.com service: peer1.org2.example.com
depends_on:
- orderer.example.com
cli: cli:
extends: extends:
@ -49,4 +57,3 @@ services:
- peer1.org1.example.com - peer1.org1.example.com
- peer0.org2.example.com - peer0.org2.example.com
- peer1.org2.example.com - peer1.org2.example.com
command: bash -c 'while true; do sleep 20170504; done'