Commit Graph

251 Commits (4ebaf86749e135b45272a353fe217d0ef9fd36c7)
 

Author SHA1 Message Date
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
qiang0723 39f672cb34 Add auto-test script for 4-peers-env 2017-05-16 18:33:23 +08:00
Baohua Yang b968e17e86 Update compose file name 2017-05-13 10:42:50 +08:00
Baohua Yang 5d3bebab77 Merge pull request #45 from qiang0723/master
Enable start with 2 orgs and 4 peers
2017-05-13 10:41:14 +08:00
Baohua Yang 414580f756 Update fabric-ca service port 2017-05-13 10:39:13 +08:00
qiang0723 2f577dcf57 Enable start with 2 orgs and 4 peers 2017-05-12 17:56:11 +08:00
Baohua Yang 8a6aef897d Support colorful cmd 2017-05-12 13:42:40 +08:00
Baohua Yang 86b92d7bbd Minor fix words 2017-05-12 11:52:39 +08:00
Baohua Yang e3543cc2ba Minor fix 2017-05-12 11:46:05 +08:00
Baohua Yang 873a91c036 Minor fix cmd 2017-05-12 10:55:39 +08:00
Baohua Yang 8127f290bc Minor fix words 2017-05-12 10:52:34 +08:00
Baohua Yang 8757ac25e0 Merge pull request #44 from qiang0723/master
Split README and update auto-test script
2017-05-11 10:35:48 +08:00
qiang0723 3315808d11 split README and update auto-test script 2017-05-10 20:07:04 +08:00
Baohua Yang 85fdd87191 Minor fix 2017-05-10 11:57:19 +08:00
Baohua Yang cb4a9e0d93 Split scripts 2017-05-10 11:56:47 +08:00
Baohua Yang d4d13fa062 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-05-09 13:30:39 +08:00
Baohua Yang b244765e14 Fix typo 2017-05-09 13:30:35 +08:00
Baohua Yang a59d759e6c Merge pull request #43 from qiang0723/master
Update with latest code change
2017-05-09 11:53:45 +08:00
qiang0723 c30d77e0a0 Add sample improvements synchronize official 2017-05-09 11:29:19 +08:00
Baohua Yang e5af06cbb8 Remove unused params 2017-05-05 14:18:46 +08:00
Baohua Yang 0d9ce01ac8 Remove unused params 2017-05-05 11:14:48 +08:00
Baohua Yang f3bdbd9a1f Add dev environment 2017-05-04 22:15:51 +08:00
Baohua Yang dde79239dc Merge pull request #38 from qiang0723/master
Update fabric-ca boot cmd
2017-04-18 22:57:22 +08:00
qiang0723 71e7d57421 update fabric-ca boot cmd 2017-04-18 17:11:24 +08:00
Baohua Yang 3833da609c Use 0.8.9 images 2017-04-18 15:47:02 +08:00
Baohua Yang 2154f16c2d Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-04-18 15:26:11 +08:00
Baohua Yang 3d3e463c80 Update ca boot cmd 2017-04-18 15:26:06 +08:00
Baohua Yang 00ea72cc06 Merge pull request #37 from qiang0723/master
Add new-channel-auto-test.sh script
2017-04-14 13:43:04 +08:00
qiang0723 9726570334 add new-channel-auto-test.sh script 2017-04-14 12:08:18 +08:00
Baohua Yang 865d707656 Merge pull request #36 from qiang0723/master
Fix default channel operation (issue #34)
2017-04-11 16:05:48 +08:00
qiang0723 69e5de95c4 Enable cc operation on default channel testchainid 2017-04-11 12:11:41 +08:00
Baohua Yang b518aeba29 Update issue template 2017-04-07 22:53:29 +08:00
Baohua Yang 7153dea8ba Enable DEBUG in peer log and minor optimize usage 2017-04-07 22:33:35 +08:00
Baohua Yang dfc2f199e9 Add running container list 2017-04-07 11:42:29 +08:00
Baohua Yang 0b0cd5d5a1 Add issue template 2017-04-06 19:45:10 +08:00
Baohua Yang 51f3cbc9a6 Update with latest image tag 2017-04-06 18:46:40 +08:00
Baohua Yang e3f3087f47 Update with new multi-channel support 2017-04-06 17:50:34 +08:00
Baohua Yang bcf2d4224c Merge pull request #28 from akm4/patch-1
Removed unused dollar symbols
2017-03-24 10:45:08 +08:00
akm4 d2b244de54 Removed redundant ampersands
The scrpt seems to be broken due to redundant ampersands before variables assigning and docker pull command
2017-03-23 12:18:09 +03:00
Baohua Yang 10e57d8178 Merge pull request #26 from icodezjb/master
Update docker-compose.yml with default config
2017-03-21 15:04:03 +08:00