Update to 1.0.2
parent
5f95b69489
commit
e6944560cf
|
@ -12,7 +12,7 @@ all:
|
||||||
make stop
|
make stop
|
||||||
|
|
||||||
ready:
|
ready:
|
||||||
@echo "Restart and init network..."
|
@echo "Restart, init network and then do cc testing..."
|
||||||
make restart init
|
make restart init
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
|
@ -29,7 +29,6 @@ init: # initialize the fabric network
|
||||||
@echo "Install and instantiate cc example02 on the fabric network"
|
@echo "Install and instantiate cc example02 on the fabric network"
|
||||||
docker exec -it fabric-cli bash -c "cd /tmp; bash scripts/initialize_all.sh"
|
docker exec -it fabric-cli bash -c "cd /tmp; bash scripts/initialize_all.sh"
|
||||||
|
|
||||||
|
|
||||||
stop: # stop the fabric network
|
stop: # stop the fabric network
|
||||||
@echo "Stop the fabric network"
|
@echo "Stop the fabric network"
|
||||||
docker-compose -f ${COMPOSE_FILE} down # Stop a fabric network
|
docker-compose -f ${COMPOSE_FILE} down # Stop a fabric network
|
|
@ -9,15 +9,15 @@ version: '2'
|
||||||
services:
|
services:
|
||||||
ca-base:
|
ca-base:
|
||||||
#image: hyperledger/fabric-ca
|
#image: hyperledger/fabric-ca
|
||||||
image: yeasy/hyperledger-fabric-ca:1.0.1
|
image: yeasy/hyperledger-fabric-ca:1.0.2
|
||||||
#image: hyperledger/fabric-ca:x86_64-1.0.1
|
#image: hyperledger/fabric-ca:x86_64-1.0.2
|
||||||
environment:
|
environment:
|
||||||
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
|
- FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
|
||||||
- FABRIC_CA_SERVER_TLS_ENABLED=true
|
- FABRIC_CA_SERVER_TLS_ENABLED=true
|
||||||
|
|
||||||
orderer-base:
|
orderer-base:
|
||||||
image: yeasy/hyperledger-fabric-orderer:1.0.1
|
image: yeasy/hyperledger-fabric-orderer:1.0.2
|
||||||
#image: hyperledger/fabric-orderer:x86_64-1.0.1
|
#image: hyperledger/fabric-orderer:x86_64-1.0.2
|
||||||
environment:
|
environment:
|
||||||
- ORDERER_GENERAL_LOGLEVEL=DEBUG
|
- ORDERER_GENERAL_LOGLEVEL=DEBUG
|
||||||
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
|
- ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
|
||||||
|
@ -41,13 +41,13 @@ services:
|
||||||
command: orderer start
|
command: orderer start
|
||||||
|
|
||||||
peer-base:
|
peer-base:
|
||||||
image: yeasy/hyperledger-fabric-peer:1.0.1
|
image: yeasy/hyperledger-fabric-peer:1.0.2
|
||||||
#image: hyperledger/fabric-peer:x86_64-1.0.1
|
#image: hyperledger/fabric-peer:x86_64-1.0.2
|
||||||
environment:
|
environment:
|
||||||
#- 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_VM_DOCKER_HOSTCONFIG_NETWORKMODE=101_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
|
||||||
- CORE_PEER_GOSSIP_ORGLEADER=false # this node is the group leader, default to false
|
- CORE_PEER_GOSSIP_ORGLEADER=false # this node is the group leader, default to false
|
||||||
|
@ -74,12 +74,12 @@ services:
|
||||||
command: peer node start
|
command: peer node start
|
||||||
|
|
||||||
peer-base-dev:
|
peer-base-dev:
|
||||||
image: yeasy/hyperledger-fabric:1.0.1
|
image: yeasy/hyperledger-fabric:1.0.2
|
||||||
environment:
|
environment:
|
||||||
#- 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_VM_DOCKER_HOSTCONFIG_NETWORKMODE=101_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
|
||||||
- CORE_PEER_GOSSIP_ORGLEADER=false # this node is the group leader, default to false
|
- CORE_PEER_GOSSIP_ORGLEADER=false # this node is the group leader, default to false
|
||||||
|
@ -106,8 +106,8 @@ services:
|
||||||
command: bash -c 'bash /tmp/peer_build.sh; peer node start'
|
command: bash -c 'bash /tmp/peer_build.sh; peer node start'
|
||||||
|
|
||||||
cli-base:
|
cli-base:
|
||||||
image: yeasy/hyperledger-fabric:1.0.1
|
image: yeasy/hyperledger-fabric:1.0.2
|
||||||
#image: hyperledger/fabric-tools:x86_64-1.0.1
|
#image: hyperledger/fabric-tools:x86_64-1.0.2
|
||||||
tty: true
|
tty: true
|
||||||
environment:
|
environment:
|
||||||
#- GOPATH=/opt/gopath
|
#- GOPATH=/opt/gopath
|
||||||
|
@ -128,6 +128,6 @@ services:
|
||||||
|
|
||||||
couchdb-base:
|
couchdb-base:
|
||||||
#container_name: couchdb0
|
#container_name: couchdb0
|
||||||
image: hyperledger/fabric-couchdb:x86_64-1.0.1
|
image: hyperledger/fabric-couchdb:x86_64-1.0.2
|
||||||
# Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service,
|
# Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service,
|
||||||
# for example map it to utilize Fauxton User Interface in dev environments.
|
# for example map it to utilize Fauxton User Interface in dev environments.
|
|
@ -9,7 +9,7 @@ version: '2.0'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ca:
|
ca:
|
||||||
image: yeasy/hyperledger-fabric-ca:1.0.1
|
image: yeasy/hyperledger-fabric-ca:1.0.2
|
||||||
container_name: fabric-ca
|
container_name: fabric-ca
|
||||||
hostname: 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
|
# 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
|
||||||
|
@ -45,7 +45,7 @@ services:
|
||||||
cli:
|
cli:
|
||||||
container_name: fabric-cli
|
container_name: fabric-cli
|
||||||
hostname: fabric-cli
|
hostname: fabric-cli
|
||||||
image: yeasy/hyperledger-fabric:1.0.1
|
image: yeasy/hyperledger-fabric:1.0.2
|
||||||
tty: true
|
tty: true
|
||||||
environment:
|
environment:
|
||||||
- CORE_PEER_ID=fabric-cli
|
- CORE_PEER_ID=fabric-cli
|
||||||
|
@ -83,7 +83,7 @@ services:
|
||||||
event-listener:
|
event-listener:
|
||||||
container_name: fabric-event-listener
|
container_name: fabric-event-listener
|
||||||
hostname: fabric-event-listener
|
hostname: fabric-event-listener
|
||||||
image: yeasy/hyperledger-fabric:1.0.1
|
image: yeasy/hyperledger-fabric:1.0.2
|
||||||
tty: true
|
tty: true
|
||||||
environment:
|
environment:
|
||||||
- CORE_PEER_ID=fabric-event-listener
|
- CORE_PEER_ID=fabric-event-listener
|
|
@ -1,5 +1,5 @@
|
||||||
# https://github.com/yeasy/docker-compose-files/tree/master/hyperledger
|
# https://github.com/yeasy/docker-compose-files/tree/master/hyperledger
|
||||||
# This compose file will start a Hyperledger Fabric 1.0.1 MVE, including
|
# This compose file will start a Hyperledger Fabric 1.0 MVE, including
|
||||||
# * 2 ca (not in use now)
|
# * 2 ca (not in use now)
|
||||||
# * 1 orderer
|
# * 1 orderer
|
||||||
# * 4 peers in 2 orgs
|
# * 4 peers in 2 orgs
|
|
@ -13,8 +13,8 @@ version: '2' # v3 does not support 'extends' yet
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ca.org1.example.com:
|
ca.org1.example.com:
|
||||||
#image: yeasy/hyperledger-fabric-ca:1.0.1
|
#image: yeasy/hyperledger-fabric-ca:1.0.2
|
||||||
#image: hyperledger/fabric-ca:x86_64-1.0.1
|
#image: hyperledger/fabric-ca:x86_64-1.0.2
|
||||||
extends:
|
extends:
|
||||||
file: base.yaml
|
file: base.yaml
|
||||||
service: ca-base
|
service: ca-base
|
||||||
|
@ -31,8 +31,8 @@ services:
|
||||||
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'
|
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:
|
ca.org2.example.com:
|
||||||
#image: yeasy/hyperledger-fabric-ca:1.0.1
|
#image: yeasy/hyperledger-fabric-ca:1.0.2
|
||||||
#image: hyperledger/fabric-ca:x86_64-1.0.1
|
#image: hyperledger/fabric-ca:x86_64-1.0.2
|
||||||
extends:
|
extends:
|
||||||
file: base.yaml
|
file: base.yaml
|
||||||
service: ca-base
|
service: ca-base
|
||||||
|
@ -64,8 +64,8 @@ services:
|
||||||
command: orderer start
|
command: orderer start
|
||||||
|
|
||||||
cli:
|
cli:
|
||||||
#image: yeasy/hyperledger-fabric:1.0.1
|
#image: yeasy/hyperledger-fabric:1.0.2
|
||||||
#image: hyperledger/fabric-tools:x86_64-1.0.1
|
#image: hyperledger/fabric-tools:x86_64-1.0.2
|
||||||
extends:
|
extends:
|
||||||
file: base.yaml
|
file: base.yaml
|
||||||
service: cli-base
|
service: cli-base
|
|
@ -37,7 +37,7 @@ services:
|
||||||
#extends:
|
#extends:
|
||||||
# file: peer-base-dev.yaml
|
# file: peer-base-dev.yaml
|
||||||
# service: peer-base
|
# service: peer-base
|
||||||
#image: yeasy/hyperledger-fabric:1.0.1
|
#image: yeasy/hyperledger-fabric:1.0.2
|
||||||
extends:
|
extends:
|
||||||
file: base.yaml
|
file: base.yaml
|
||||||
service: cli-base
|
service: cli-base
|
|
@ -11,7 +11,7 @@ version: '2.0'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
ca:
|
ca:
|
||||||
image: yeasy/hyperledger-fabric-ca:1.0.1
|
image: yeasy/hyperledger-fabric-ca:1.0.2
|
||||||
container_name: fabric-ca
|
container_name: fabric-ca
|
||||||
hostname: 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
|
# 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
|
||||||
|
@ -20,7 +20,7 @@ services:
|
||||||
command: fabric-ca-server start -b admin:adminpw
|
command: fabric-ca-server start -b admin:adminpw
|
||||||
|
|
||||||
orderer0: # There can be multiple orderers
|
orderer0: # There can be multiple orderers
|
||||||
image: yeasy/hyperledger-fabric-orderer:1.0.1
|
image: yeasy/hyperledger-fabric-orderer:1.0.2
|
||||||
container_name: fabric-orderer0
|
container_name: fabric-orderer0
|
||||||
hostname: orderer0
|
hostname: orderer0
|
||||||
environment:
|
environment:
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue