Commit Graph

190 Commits (aa82a4d183fead8cd7f41f0ede663bddcf3b575d)
 

Author SHA1 Message Date
Baohua Yang aa82a4d183 Merge pull request #73 from qiang0723/master
Update crypto-config
2017-06-26 21:38:23 +08:00
qiang0723 5a97ae690e Update crypto-config 2017-06-26 11:23:59 +08:00
Baohua Yang 7e9cc545f0 Merge pull request #70 from qiang0723/master
Update crypto-config and channel-artifacts
2017-06-23 20:42:32 +08:00
qiang0723 0b2aa5bd01 Update crypto-config and channel-artifacts 2017-06-23 18:44:44 +08:00
Baohua Yang 25a7ad8d1c Update tlsca path 2017-06-23 10:59:32 +08:00
Baohua Yang a3bd35f0e5 Update crypto-config files 2017-06-23 10:46:40 +08:00
Baohua Yang 8b6a7c2113 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-06-23 10:46:23 +08:00
Baohua Yang 9041e88c74 Update crypto-config files 2017-06-23 10:46:20 +08:00
Baohua Yang f6377d1e14 Merge pull request #69 from qiang0723/master
Add  couchdb support
2017-06-22 18:18:05 +08:00
qiang0723 2e11567591 Add usage of couchdb 2017-06-22 17:58:40 +08:00
Baohua Yang 6742253bf4 Remove unused flags 2017-06-21 20:52:24 +08:00
Baohua Yang f262f5285c Merge pull request #66 from qiang0723/master
Sync official compose file
2017-06-21 20:45:30 +08:00
qiang0723 202b8516d5 Sync official compose file 2017-06-21 15:51:41 +08:00
Baohua Yang 5b5e0242f3 Merge pull request #64 from qiang0723/master
Update docs structure
2017-06-17 14:57:21 +08:00
qiang0723 3342e619a4 Update docs 2017-06-16 18:53:28 +08:00
Baohua Yang fe3251020e Merge pull request #63 from qiang0723/master
Update docker-compose-1peer.yaml
2017-06-16 17:46:06 +08:00
qiang0723 604e02174b Modify docker-compose-1peer.yaml 2017-06-16 15:56:25 +08:00
Baohua Yang 760bf4c0a8 Merge pull request #62 from qiang0723/master
Support colorful cmd for test scripts
2017-06-15 09:53:25 +08:00
qiang0723 a83a419258 add colorful cmd for test scripts 2017-06-14 13:30:12 +08:00
Baohua Yang 9f0b6625c9 Disable tls for event listener 2017-06-13 22:10:45 +08:00
Baohua Yang 23f08181d5 Merge pull request #59 from gymgle/master
Fix noops network
2017-06-13 22:07:11 +08:00
Baohua Yang 7bd41670dc Merge pull request #61 from qiang0723/master
Enable TLS by default
2017-06-13 22:06:48 +08:00
qiang0723 fe6b6bedc4 Enable TLS 2017-06-13 17:40:28 +08:00
Gymgle 91ac8a82c2 Fix noops network 2017-06-13 17:13:46 +08:00
Baohua Yang 42d70cf725 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-06-13 10:13:21 +08:00
Baohua Yang aa6569ad70 Update e2e_cli content with official repo 2017-06-13 10:13:18 +08:00
Baohua Yang 463c8ffd17 Merge pull request #58 from qiang0723/master
Update 1-peer compose file and test script
2017-06-12 16:42:27 +08:00
qiang0723 b07de81c45 Update 1-peer compose file and test script 2017-06-12 15:12:16 +08:00
Baohua Yang b5acaa8516 Add the json structure files 2017-06-10 16:52:48 +08:00
Baohua Yang bbf335de99 Add orderer.genesis.json 2017-06-10 13:57:05 +08:00
Baohua Yang 02a940203e Merge pull request #56 from qiang0723/master
Split script and add block files
2017-06-09 21:22:55 +08:00
qiang0723 6f25602b54 split script and add blocks 2017-06-09 19:42:58 +08:00
Baohua Yang 1e91338629 Add event listener 2017-06-09 14:15:04 +08:00
Baohua Yang aa5b44cb86 Merge pull request #55 from qiang0723/master
Update instructions and the docker-compose-file
2017-06-08 19:58:01 +08:00
qiang0723 5b8fa16810 update docker-compose-file 2017-06-08 17:30:33 +08:00
Baohua Yang 9fc9a11e12 Fix image tags 2017-06-08 11:44:31 +08:00
Baohua Yang 5fef78ba41 Update code structures 2017-06-07 15:53:15 +08:00
Baohua Yang 1c52d748b4 Use file by default in orderer ledger 2017-06-05 16:04:29 +08:00
Baohua Yang d476dbb2b8 Rename orderer genesis block 2017-06-05 16:03:13 +08:00
Baohua Yang e24e6dc54b Rename orderer genesis block 2017-06-05 16:01:44 +08:00
Baohua Yang 2569f8bf19 Merge pull request #52 from qiang0723/master
Update GenerateArtifacts.md
2017-06-04 21:35:15 +08:00
qiang0723 f31c08f820 Update GenerateArtifacts.md 2017-06-01 18:12:05 +08:00
Baohua Yang 2a2e4b13bc Update instructions 2017-06-01 11:15:41 +08:00
Baohua Yang 7a0f2f7ba4 Minor update 2017-05-31 14:20:24 +08:00
Baohua Yang 89cd08772d Remove unused env variable 2017-05-30 15:48:13 +08:00
Baohua Yang 6cceb0706c Fix ca ports 2017-05-28 10:05:11 +08:00
Baohua Yang c984ad3f47 Use v0.9.3 images 2017-05-22 16:42:30 +08:00
Baohua Yang c90496a338 Merge pull request #47 from qiang0723/master
Add usage of cryptogen and configtxgen
2017-05-18 22:21:43 +08:00
qiang0723 7f01556fba Add usage of cryptogen and configtxgen 2017-05-18 17:12:14 +08:00
Baohua Yang 7ac037095a Merge pull request #46 from qiang0723/master
Add auto-test script for 4-peers-env
2017-05-17 11:47:28 +08:00