Commit Graph

536 Commits (master)
 

Author SHA1 Message Date
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
icodezjb 0e7dea10c8 Update docker-compose.yml
use "fabric-ca-server start -c testdata/testconfig.json" ,it seems use default values in testconfig.json
2017-03-21 11:38:27 +08:00
Baohua Yang 2980ddfc60 Fix fabric-ca start cmd 2017-03-21 11:07:39 +08:00
Baohua Yang 72394aa77e Fix quotation bug 2017-03-21 10:20:59 +08:00
Baohua Yang 33c7d86552 Fix fabric-ca startup cmd 2017-03-21 10:09:49 +08:00
Baohua Yang 4d4dc8d0f3 Merge pull request #25 from icodezjb/master
Update docker-compose.yml with fabric-ca-server cmd
2017-03-20 20:25:42 +08:00
icodezjb c51de1f901 Update docker-compose.yml
modify the error “fabric-ca server” to "fabric-ca-server"
2017-03-20 19:48:19 +08:00
Baohua Yang 6f74a8e86e Merge pull request #23 from qiang0723/master
Update tag 0.8.6; add create/join channel examples
2017-03-15 11:37:38 +08:00
qiang0723 b651b52765 update tag 0.8.6 2017-03-15 10:09:26 +08:00
Baohua Yang aac332d879 Use 0.8.5 tag 2017-03-02 17:37:09 +08:00
Baohua Yang 8d152e5eb4 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-03-02 17:36:34 +08:00
Baohua Yang 5fecbc9469 Merge pull request #21 from qiang0723/master
Update the images tag to 0.8.4
2017-02-27 11:41:51 +08:00
qiang0723 19737c8672 update the images tag to 0.8.4 2017-02-27 10:38:25 +08:00
Baohua Yang 9cced75133 Merge branch 'master' of github.com:yeasy/docker-compose-files 2017-02-27 08:56:36 +08:00
Baohua Yang df1b15759b Update with latest code 2017-02-27 08:56:30 +08:00
Baohua Yang bd3897b799 Merge pull request #19 from qiang0723/master
Use IMG_VERSION env variable
2017-02-21 23:50:20 +08:00