Update file names

pull/108/head
Baohua Yang 2017-11-01 20:12:59 +08:00
parent fce22758d9
commit c138ea3aaf
11 changed files with 93 additions and 423 deletions

View File

@ -10,7 +10,7 @@ version: '2.0'
services:
orderer.example.com: # There can be multiple orderers
extends:
file: docker-compose-base-dev.yaml
file: base-dev.yaml
service: orderer.example.com
depends_on:
- kafka0
@ -20,14 +20,14 @@ services:
peer0.org1.example.com:
extends:
file: docker-compose-base-dev.yaml
file: base-dev.yaml
service: peer0.org1.example.com
depends_on:
- orderer.example.com
cli:
extends:
file: docker-compose-base-dev.yaml
file: base-dev.yaml
service: cli
depends_on:
- peer0.org1.example.com

View File

@ -17,12 +17,12 @@ version: '2'
services:
orderer.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: orderer.example.com
peer0.org1.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.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: base-solo.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: base-solo.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: base-solo.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: base-solo.yaml
service: cli

View File

@ -19,32 +19,32 @@ services:
orderer.example.com: # There can be multiple orderers
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: orderer.example.com
peer0.org1.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: peer0.org1.example.com
peer1.org1.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: peer1.org1.example.com
peer0.org2.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: peer0.org2.example.com
peer1.org2.example.com:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: peer1.org2.example.com
cli:
extends:
file: docker-compose-base-e2e.yaml
file: base-solo.yaml
service: cli
environment:
- CORE_PEER_TLS_ENABLED=false # event-listener doesn't support TLS
@ -65,11 +65,11 @@ services:
- 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
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/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts
- ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
- ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
#- ./solo/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
- ./solo/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
- ./solo/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts
- ./solo/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
- ./solo/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
- ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
depends_on:
- orderer.example.com

View File

@ -10,66 +10,66 @@ version: '2.0'
services:
# ca.org1.example.com:
# extends:
# file: docker-compose-base-kafka.yaml
# file: base-kafka.yaml
# service: ca.org1.example.com
# ca.org2.example.com:
# extends:
# file: docker-compose-base-kafka.yaml
# file: base-kafka.yaml
# service: ca.org2.example.com
cli:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: cli
orderer.example.com: # There can be multiple orderers
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: orderer.example.com
peer0.org1.example.com:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: peer0.org1.example.com
peer1.org1.example.com:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: peer1.org1.example.com
peer0.org2.example.com:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: peer0.org2.example.com
peer1.org2.example.com:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: peer1.org2.example.com
# ZooKeeper services, at least 3 nodes
zookeeper0:
extends:
file: docker-compose-base-kafka.yaml
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
file: base-kafka.yaml
service: zookeeper0
zookeeper1:
extends:
file: docker-compose-base-kafka.yaml
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
file: base-kafka.yaml
service: zookeeper1
zookeeper2:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: zookeeper2
# Kafka services, at least 4 node to tolerant work with 1 node failure
kafka0:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: kafka0
depends_on:
- zookeeper0
@ -78,7 +78,7 @@ services:
kafka1:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: kafka1
depends_on:
- zookeeper0
@ -87,7 +87,7 @@ services:
kafka2:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: kafka2
depends_on:
- zookeeper0
@ -96,7 +96,7 @@ services:
kafka3:
extends:
file: docker-compose-base-kafka.yaml
file: base-kafka.yaml
service: kafka3
depends_on:
- zookeeper0

View File

@ -1,96 +0,0 @@
# This is the development compose file to config env and command
# Notice that chaincode is executed inside docker in default net mode
# https://github.com/yeasy/docker-compose-files
# Depends on the yeasy/hyperledger-fabric image.
version: '2'
services:
orderer.example.com: # There can be multiple orderers
extends:
file: base.yaml
service: orderer-base
image: yeasy/hyperledger-fabric:1.0.3
container_name: orderer.example.com
hostname: orderer.example.com
ports:
- "7050:7050"
environment:
# Kafka related configurations
- ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
- ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
- ORDERER_KAFKA_VERBOSE=true
volumes:
- $GOPATH/src/github.com/hyperledger/fabric:/go/src/github.com/hyperledger/fabric
# for e2e_cli case
#- ./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
# for kafka case
- ./kafka/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block
- ./kafka/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp
- ./kafka/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls
#command: bash -c 'bash /tmp/orderer_build.sh; orderer start' # use this if to debug orderer
command: bash -c 'orderer start' # use this if to debug orderer
peer0.org1.example.com:
extends:
file: base.yaml
service: peer-base
image: yeasy/hyperledger-fabric:latest
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_CHAINCODELISTENADDRESS=peer0.org1.example.com:7052
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
- CORE_PEER_LOCALMSPID=Org1MSP
volumes:
- $GOPATH/src/github.com/hyperledger/fabric:/go/src/github.com/hyperledger/fabric
# e2e mode configuration
#- ./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
# kafka mode configuration
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls
ports:
- 7051:7051
- 7052:7052
- 7053:7053
#command: bash -c 'bash /tmp/peer_build.sh; peer node start'
command: bash -c 'peer node start'
cli:
extends:
file: base.yaml
service: cli-base
image: yeasy/hyperledger-fabric:1.0.3
container_name: fabric-cli
hostname: fabric-cli
tty: true
environment:
- CORE_PEER_ID=fabric-cli
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1
- CORE_PEER_LOCALMSPID=Org1MSP
- 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
volumes:
- $GOPATH/src/github.com/hyperledger/fabric:/opt/gopath/src/github.com/hyperledger/fabric
- /tmp/:/tmp/
- ./scripts:/tmp/scripts
# e2e mode configuration
#- ./e2e_cli/channel-artifacts:/tmp/channel-artifacts
#- ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
#- ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
#- ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto
#- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
# kafka mode configuration
- ./kafka/channel-artifacts:/tmp/channel-artifacts
- ./kafka/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
- ./kafka/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
- ./kafka/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto
- ./kafka/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples

View File

@ -1,259 +0,0 @@
# Kafka enabled fabric network with:
# ca.org1.example.com
# ca.org2.example.com
# orderer.example.com
# peer0.org1.example.com
# peer1.org1.example.com
# peer0.org2.example.com
# peer1.org2.example.com
# 3 zookeeper nodes
# 4 kafka nodes
# cli
version: '2' # v3 does not support 'extends' yet
services:
ca.org1.example.com:
#image: yeasy/hyperledger-fabric-ca:1.0.3
#image: hyperledger/fabric-ca:x86_64-1.0.3
extends:
file: base.yaml
service: ca-base
container_name: ca.org1.example.com
hostname: ca.org1.example.com
environment:
- FABRIC_CA_SERVER_CA_NAME=ca-org1
- FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem
- FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk
ports:
- "7054:7054"
volumes:
- ./kafka/crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config
command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/c843d3f021118963ce5d340e95286e8869bb7bd051454cd4166aa2887a2ad451_sk -b admin:adminpw -d'
ca.org2.example.com:
#image: yeasy/hyperledger-fabric-ca:1.0.3
#image: hyperledger/fabric-ca:x86_64-1.0.3
extends:
file: base.yaml
service: ca-base
container_name: ca.org2.example.com
hostname: ca.org2.example.com
environment:
- FABRIC_CA_SERVER_CA_NAME=ca-org2
- FABRIC_CA_SERVER_TLS_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem
- FABRIC_CA_SERVER_TLS_KEYFILE=/etc/hyperledger/fabric-ca-server-config/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk
ports:
- "8054:7054"
volumes:
- ./kafka/crypto-config/peerOrganizations/org2.example.com/ca/:/etc/hyperledger/fabric-ca-server-config
command: sh -c 'fabric-ca-server start --ca.certfile /etc/hyperledger/fabric-ca-server-config/ca.org2.example.com-cert.pem --ca.keyfile /etc/hyperledger/fabric-ca-server-config/1ee551a8753171c0377366e96a1d7ec01afddb868c9483cc501b6f8ac7ae752f_sk -b admin:adminpw -d'
orderer.example.com: # There can be multiple orderers
extends:
file: base.yaml
service: orderer-base
container_name: orderer.example.com
hostname: orderer.example.com
ports:
- "7050:7050"
environment:
# Kafka related configurations
- ORDERER_KAFKA_RETRY_SHORTINTERVAL=1s
- ORDERER_KAFKA_RETRY_SHORTTOTAL=30s
- ORDERER_KAFKA_VERBOSE=true
volumes:
- ./kafka/channel-artifacts/orderer.genesis.block:/var/hyperledger/orderer/orderer.genesis.block
- ./kafka/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp:/var/hyperledger/orderer/msp
- ./kafka/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/:/var/hyperledger/orderer/tls
command: orderer start
cli:
extends:
file: base.yaml
service: cli-base
container_name: fabric-cli
hostname: fabric-cli
tty: true
environment:
- CORE_PEER_ID=fabric-cli
- CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1
- CORE_PEER_LOCALMSPID=Org1MSP
- 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
volumes:
- ./scripts:/tmp/scripts
- ./kafka/channel-artifacts:/tmp/channel-artifacts
- ./kafka/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
- ./kafka/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
- ./kafka/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto
- ./kafka/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
## following are peer nodes ##
peer0.org1.example.com:
extends:
file: base.yaml
service: peer-base
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_CHAINCODELISTENADDRESS=peer0.org1.example.com:7052
- CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
- CORE_PEER_LOCALMSPID=Org1MSP
volumes:
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/fabric/msp
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls:/etc/hyperledger/fabric/tls
ports:
- 7051:7051
- 7052:7052
- 7053:7053
peer1.org1.example.com:
extends:
file: base.yaml
service: peer-base
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_CHAINCODELISTENADDRESS=peer1.org1.example.com:7052
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051
- CORE_PEER_LOCALMSPID=Org1MSP
volumes:
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/msp:/etc/hyperledger/fabric/msp
- ./kafka/crypto-config/peerOrganizations/org1.example.com/peers/peer1.org1.example.com/tls:/etc/hyperledger/fabric/tls
ports:
- 8051:7051
- 8052:7052
- 8053:7053
peer0.org2.example.com:
extends:
file: base.yaml
service: peer-base
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_CHAINCODELISTENADDRESS=peer0.org2.example.com:7052
- CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:7051
- CORE_PEER_LOCALMSPID=Org2MSP
volumes:
- ./kafka/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/msp:/etc/hyperledger/fabric/msp
- ./kafka/crypto-config/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls:/etc/hyperledger/fabric/tls
ports:
- 9051:7051
- 9052:7052
- 9053:7053
peer1.org2.example.com:
extends:
file: base.yaml
service: peer-base
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_CHAINCODELISTENADDRESS=peer1.org2.example.com:7052
- CORE_PEER_GOSSIP_BOOTSTRAP=peer1.org2.example.com:7051
- CORE_PEER_LOCALMSPID=Org2MSP
volumes:
- ./kafka/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/msp:/etc/hyperledger/fabric/msp
- ./kafka/crypto-config/peerOrganizations/org2.example.com/peers/peer1.org2.example.com/tls:/etc/hyperledger/fabric/tls
ports:
- 10051:7051
- 10052:7052
- 10053:7053
# ZooKeeper services, at least 3 nodes
zookeeper0:
extends:
file: base.yaml
service: zookeeper-base
container_name: zookeeper0
hostname: zookeeper0
environment:
- ZOO_MY_ID=1
- ZOO_SERVERS=server.1=zookeeper0:2888:3888 server.2=zookeeper1:2888:3888 server.3=zookeeper2:2888:3888
zookeeper1:
extends:
file: base.yaml
service: zookeeper-base
container_name: zookeeper1
hostname: zookeeper1
environment:
- ZOO_MY_ID=2
- ZOO_SERVERS=server.1=zookeeper0:2888:3888 server.2=zookeeper1:2888:3888 server.3=zookeeper2:2888:3888
zookeeper2:
extends:
file: base.yaml
service: zookeeper-base
container_name: zookeeper2
hostname: zookeeper2
environment:
- ZOO_MY_ID=3
- ZOO_SERVERS=server.1=zookeeper0:2888:3888 server.2=zookeeper1:2888:3888 server.3=zookeeper2:2888:3888
# Kafka services, at least 4 node to tolerant work with 1 node failure
kafka0:
extends:
file: base.yaml
service: kafka-base
container_name: kafka0
hostname: kafka0
environment:
- KAFKA_BROKER_ID=0
- KAFKA_MIN_INSYNC_REPLICAS=2
- KAFKA_DEFAULT_REPLICATION_FACTOR=3
- KAFKA_ZOOKEEPER_CONNECT=zookeeper0:2181,zookeeper1:2181,zookeeper2:2181
kafka1:
extends:
file: base.yaml
service: kafka-base
container_name: kafka1
hostname: kafka1
environment:
- KAFKA_BROKER_ID=1
- KAFKA_DEFAULT_REPLICATION_FACTOR=3
- KAFKA_MIN_INSYNC_REPLICAS=2
- KAFKA_ZOOKEEPER_CONNECT=zookeeper0:2181,zookeeper1:2181,zookeeper2:2181
kafka2:
extends:
file: base.yaml
service: kafka-base
container_name: kafka2
hostname: kafka2
environment:
- KAFKA_BROKER_ID=2
- KAFKA_DEFAULT_REPLICATION_FACTOR=3
- KAFKA_MIN_INSYNC_REPLICAS=2
- KAFKA_ZOOKEEPER_CONNECT=zookeeper0:2181,zookeeper1:2181,zookeeper2:2181
kafka3:
extends:
file: base.yaml
service: kafka-base
container_name: kafka3
hostname: kafka3
environment:
- KAFKA_BROKER_ID=3
- KAFKA_DEFAULT_REPLICATION_FACTOR=3
- KAFKA_MIN_INSYNC_REPLICAS=2
- KAFKA_ZOOKEEPER_CONNECT=zookeeper0:2181,zookeeper1:2181,zookeeper2:2181

View File

@ -16,12 +16,6 @@ limitations under the License.
package main
//WARNING - this chaincode's ID is hard-coded in chaincode_example04 to illustrate one way of
//calling chaincode from a chaincode. If this example is modified, chaincode_example04.go has
//to be modified as well with the new ID of chaincode_example02.
//chaincode_example05 show's how chaincode ID can be passed in as a parameter instead of
//hard-coding.
import (
"fmt"
"strconv"

View File

@ -4,10 +4,12 @@
CONFIGTXLATOR_IMG=yeasy/hyperledger-fabric:latest
CONFIGTXLATOR_CONTAINER=configtxlator
ORDERER_GENESIS_BLOCK=channel-artifacts/orderer.genesis.block
ORDERER_GENESIS_UPDATED_BLOCK=channel-artifacts/orderer.genesis.updated.block
ORDERER_GENESIS_JSON=channel-artifacts/orderer.genesis.json
ORDERER_GENESIS_UPDATED_JSON=channel-artifacts/orderer.genesis.updated.json
ARTIFACTS_DIR=channel-artifacts
ORDERER_GENESIS_BLOCK=${ARTIFACTS_DIR}/orderer.genesis.block
ORDERER_GENESIS_UPDATED_BLOCK=${ARTIFACTS_DIR}/orderer.genesis.updated.block
ORDERER_GENESIS_JSON=${ARTIFACTS_DIR}/orderer.genesis.json
ORDERER_GENESIS_UPDATED_JSON=${ARTIFACTS_DIR}/orderer.genesis.updated.json
MAXBATCHSIZEPATH=".data.data[0].payload.data.config.channel_group.groups.Orderer.values.BatchSize.value.max_message_count"
echo "Clean potential existing container $CONFIGTXLATOR_CONTAINER"
@ -23,23 +25,36 @@ docker run \
sleep 1
echo "Decoding the orderer genesis block to json"
curl -X POST \
--data-binary @${ORDERER_GENESIS_BLOCK} \
http://127.0.0.1:7059/protolator/decode/common.Block \
> ${ORDERER_GENESIS_JSON}
if [ -f ${ORDERER_GENESIS_BLOCK} ]; then
echo "Decoding the orderer genesis block to json"
curl -X POST \
--data-binary @${ORDERER_GENESIS_BLOCK} \
http://127.0.0.1:7059/protolator/decode/common.Block \
> ${ORDERER_GENESIS_JSON}
echo "Checking existing Orderer.BatchSize.max_message_count in the genesis json"
jq "$MAXBATCHSIZEPATH" channel-artifacts/orderer.genesis.json
echo "Checking existing Orderer.BatchSize.max_message_count in the genesis json"
jq "$MAXBATCHSIZEPATH" channel-artifacts/orderer.genesis.json
echo "Creating new genesis json with updated Orderer.BatchSize.max_message_count"
jq "$MAXBATCHSIZEPATH=20" ${ORDERER_GENESIS_JSON} > ${ORDERER_GENESIS_UPDATED_JSON}
echo "Creating new genesis json with updated Orderer.BatchSize.max_message_count"
jq "$MAXBATCHSIZEPATH=20" ${ORDERER_GENESIS_JSON} > ${ORDERER_GENESIS_UPDATED_JSON}
echo "Re-Encoding the orderer genesis json to block"
curl -X POST \
--data-binary @${ORDERER_GENESIS_UPDATED_JSON} \
http://127.0.0.1:7059/protolator/encode/common.Block \
>${ORDERER_GENESIS_UPDATED_BLOCK}
echo "Re-Encoding the orderer genesis json to block"
curl -X POST \
--data-binary @${ORDERER_GENESIS_UPDATED_JSON} \
http://127.0.0.1:7059/protolator/encode/common.Block \
>${ORDERER_GENESIS_UPDATED_BLOCK}
fi
for i in {0..9}
do
BLOCK_FILE=${ARTIFACTS_DIR}/block_${i}.block
if [ -f ${BLOCK_FILE} ]; then
echo "Decoding block $i of app channel to json"
curl -X POST \
--data-binary @${BLOCK_FILE} \
http://127.0.0.1:7059/protolator/decode/common.Block \
> ${BLOCK_FILE}.json
fi
done
docker rm -f $CONFIGTXLATOR_CONTAINER

View File

@ -164,16 +164,32 @@ channelJoin () {
# Instantiate chaincode on specifized peer node
chaincodeInstantiate () {
#CHANNEL_NAME=$1
PEER=$1
CHANNEL_NAME=$1
PEER=$2
setGlobals $PEER
echo_b "===================== chaincodeInstantiate for channel $CHANNEL_NAME on peer $PEER ============"
# while 'peer chaincode' command can get the orderer endpoint from the peer (if join was successful),
# lets supply it directly as we know it using the "-o" option
if [ -z "$CORE_PEER_TLS_ENABLED" -o "$CORE_PEER_TLS_ENABLED" = "false" ]; then
peer chaincode instantiate -o orderer.example.com:7050 -C $CHANNEL_NAME -n $CC_NAME -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" >&log.txt
peer chaincode instantiate \
-o orderer.example.com:7050 \
-C $CHANNEL_NAME \
-n $CC_NAME \
-v 1.0 \
-c '{"Args":["init","a","100","b","200"]}' \
-P "OR ('Org1MSP.member','Org2MSP.member')" \
>&log.txt
else
peer chaincode instantiate -o orderer.example.com:7050 --tls $CORE_PEER_TLS_ENABLED --cafile $ORDERER_CA -C $CHANNEL_NAME -n $CC_NAME -v 1.0 -c '{"Args":["init","a","100","b","200"]}' -P "OR ('Org1MSP.member','Org2MSP.member')" >&log.txt
peer chaincode instantiate \
-o orderer.example.com:7050 \
-C $CHANNEL_NAME \
-n $CC_NAME \
-v 1.0 \
-c '{"Args":["init","a","100","b","200"]}' \
-P "OR ('Org1MSP.member','Org2MSP.member')" \
--tls $CORE_PEER_TLS_ENABLED \
--cafile $ORDERER_CA \
>&log.txt
fi
res=$?
cat log.txt

View File

@ -38,8 +38,8 @@ chaincodeInstall 3 1.0
# Instantiate chaincode on all peers
# Instantiate can only be executed once on any node
echo_b "Instantiating chaincode on all 2 orgs (once for each org)..."
chaincodeInstantiate 0
chaincodeInstantiate 2
chaincodeInstantiate $CHANNEL_NAME 0
chaincodeInstantiate $CHANNEL_NAME 2
echo
echo_g "===================== All GOOD, initialization completed ===================== "

View File

@ -28,7 +28,7 @@ channelJoin 0
sleep 1
## Set the anchor peers for each org in the channel
echo_b "Updating anchor peers for peer0/org1..."
echo_b "Updating anchor peers for peer0/org1... no use for only single channel"
updateAnchorPeers 0
sleep 1