yeasy
/
docker-compose-files
mirror of https://github.com/yeasy/docker-compose-files.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor update

pull/108/head
Baohua Yang 2017-09-21 16:01:38 +08:00
parent e2b1460573
commit e91addc31f
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hyperledger/1.0.2/Makefile
View File

@ -50,7 +50,7 @@ dev:
dev_ready: dev_ready:
@echo "Restart and init network for dev mode..." @echo "Restart and init network for dev mode..."
make dev_restart make dev_restart
sleep 30 sleep 35
make dev_init make dev_init
sleep 2 sleep 2
@ -80,6 +80,9 @@ dev_download: # download required images
docker pull hyperledger/fabric-baseos:x86_64-0.4.1 docker pull hyperledger/fabric-baseos:x86_64-0.4.1
docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-ccenv:x86_64-1.1.0 docker tag yeasy/hyperledger-fabric:latest hyperledger/fabric-ccenv:x86_64-1.1.0
dev_logs: # show dev logs
docker-compose -f ${COMPOSE_DEV_FILE} logs -f --tail 200
################## Couchdb testing ################ ################## Couchdb testing ################
couch: couch:
@echo "Please make sure u have setup Docker and pulled images by 'make setup'." @echo "Please make sure u have setup Docker and pulled images by 'make setup'."
@ -155,9 +158,6 @@ ps: # show existing docker images
logs: # show logs logs: # show logs
docker-compose -f ${COMPOSE_FILE} logs -f --tail 200 docker-compose -f ${COMPOSE_FILE} logs -f --tail 200
dev_logs: # show dev logs
docker-compose -f ${COMPOSE_DEV_FILE} logs -f --tail 200
logs_check: logs_save logs_view logs_check: logs_save logs_view
logs_save: # save logs logs_save: # save logs

9
hyperledger/1.0.2/base.yaml
View File

@ -105,7 +105,7 @@ services:
#- CORE_PEER_ID=peer0 #- CORE_PEER_ID=peer0
- CORE_PEER_ADDRESSAUTODETECT=false - CORE_PEER_ADDRESSAUTODETECT=false
- CORE_LOGGING_LEVEL=DEBUG - CORE_LOGGING_LEVEL=DEBUG
- CORE_LOGGING_FORMAT=%{color}[%{id:03x} %{time:01-02 15:04:05.00 MST}] [%{longpkg}] %{callpath} -> %{level:.4s} %{message}%{color:reset} - CORE_LOGGING_FORMAT=%{color}[%{id:03x} %{time:01-02 15:04:05.00 MST}] [%{longpkg}] %{callpath} -> %{level:.4s}%{color:reset} %{message}
- CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=102_default # uncomment this to use specific network - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=102_default # uncomment this to use specific network
#- CORE_PEER_NETWORKID=dev #- CORE_PEER_NETWORKID=dev
- CORE_PEER_GOSSIP_USELEADERELECTION=true - CORE_PEER_GOSSIP_USELEADERELECTION=true
@ -136,6 +136,7 @@ services:
#image: hyperledger/fabric-orderer:x86_64-1.0.2 #image: hyperledger/fabric-orderer:x86_64-1.0.2
environment: environment:
- ORDERER_GENERAL_LOGLEVEL=DEBUG - ORDERER_GENERAL_LOGLEVEL=DEBUG
- ORDERER_GENERAL_LOGFORMAT=%{color}[%{id:03x} %{time:01-02 15:04:05.00 MST}] [%{longpkg}] %{callpath} -> %{level:.4s}%{color:reset} %{message}
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
- ORDERER_GENERAL_GENESISMETHOD=file - ORDERER_GENERAL_GENESISMETHOD=file
- ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block - ORDERER_GENERAL_GENESISFILE=/var/hyperledger/orderer/orderer.genesis.block
@ -154,8 +155,10 @@ services:
- ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt] - ORDERER_GENERAL_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
expose: expose:
- "7050" # - "7050" #
volumes: # docker.sock is mapped as the default CORE_VM_ENDPOINT
- $GOPATH/src/github.com/hyperledger/fabric:/go/src/github.com/hyperledger/fabric
#command: bash -c 'bash /tmp/orderer_build.sh; orderer start' # use this if to debug orderer #command: bash -c 'bash /tmp/orderer_build.sh; orderer start' # use this if to debug orderer
command: bash -c 'orderer start' command: bash -c 'bash /tmp/orderer_build.sh; orderer start'
cli-base-dev: cli-base-dev:
image: yeasy/hyperledger-fabric:latest image: yeasy/hyperledger-fabric:latest
@ -176,4 +179,4 @@ services:
- ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto
- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples - ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
command: bash -c 'while true; do sleep 20170910; done' command: bash -c 'cd /tmp; bash scripts/func.sh; while true; do sleep 20170910; done'

1
hyperledger/1.0.2/docker-compose-dev.yaml
View File

@ -41,6 +41,7 @@ services:
- 7051:7051 - 7051:7051
- 7052:7052 - 7052:7052
- 7053:7053 - 7053:7053
command: bash -c 'peer node start'
#command: bash -c 'bash /tmp/peer_build.sh; peer node start' #command: bash -c 'bash /tmp/peer_build.sh; peer node start'
cli: cli:

8
hyperledger/1.0.2/scripts/func.sh
View File

@ -97,6 +97,14 @@ createChannel() {
fi fi
res=$? res=$?
cat log.txt cat log.txt
if [ $res -ne 0 -a $COUNTER -lt $MAX_RETRY ]; then
COUNTER=` expr $COUNTER + 1`
echo_b "PEER$1 failed to create the channel, Retry after 2 seconds"
sleep 2
createChannel
else
COUNTER=1
fi
verifyResult $res "Channel creation failed" verifyResult $res "Channel creation failed"
echo_g "===================== Channel \"$CHANNEL_NAME\" is created successfully ===================== " echo_g "===================== Channel \"$CHANNEL_NAME\" is created successfully ===================== "
echo echo