Commit Graph

444 Commits (a0846ccebe1486b7232d30bb59093dcf1a3aa222)
 

Author SHA1 Message Date
Baohua Yang 075084cc7c
Merge pull request #128 from ShuoWangNSL/master
Use fabric ca for fabric 1.3
2018-10-27 11:11:08 +08:00
Shuo Wang d30e30da94 Use fabric ca for fabric 1.3
Signed-off-by: Shuo Wang <wang658@usc.edu>
2018-10-26 03:41:17 -07:00
Baohua Yang 86f0642d20
Merge pull request #127 from ShuoWangNSL/master
Removed unused code.
2018-10-12 22:06:43 +08:00
Shuo Wang 919364efcf Refine code in fabric-ca 2018-10-12 06:41:57 -07:00
Baohua Yang 5b742d284a Merge branch 'master' of github.com:yeasy/docker-compose-files 2018-10-12 21:31:25 +08:00
Baohua Yang 0115e8175c Generated credential's cn has no suffix 2018-10-12 21:31:06 +08:00
Baohua Yang e0d9d7fee0
Merge pull request #126 from ShuoWangNSL/master
Update fabric ca for fabric 1.2
2018-10-12 17:01:20 +08:00
Shuo Wang f36c3be986 Use fabric ca for fabric 1.2
Signed-off-by: Shuo Wang <shuo.wang94@gmail.com>
2018-10-12 03:50:50 +00:00
Baohua Yang 593f88c33f Use configtxlator cmd instead of REST 2018-10-12 11:33:24 +08:00
Baohua Yang 8f408e55e3 Support 2 orderers in kafka mode 2018-10-11 22:29:09 +08:00
Baohua Yang 49868aa5ad Finish v1.3.0 testing 2018-10-11 13:55:49 +08:00
Baohua Yang afaa0195f9 Add v1.3.0 2018-10-11 13:53:01 +08:00
Baohua Yang 8c92d1c0f1 Start ca test 2018-10-10 17:18:00 +08:00
Baohua Yang 43acba7867 Update baseimage to 0.4.13 2018-10-09 14:04:05 +08:00
Baohua Yang 826bd8ea9d Fix convert to json issue 2018-10-09 14:02:33 +08:00
Baohua Yang 0499580071 Merge branch 'master' of github.com:yeasy/docker-compose-files 2018-09-29 17:44:44 +08:00
Baohua Yang 22c7152d23 Verify with latest code 2018-09-29 17:44:36 +08:00
Baohua Yang c2e9b57ff9
Merge pull request #125 from ShuoWangNSL/master
Use fabric ca to bootstrap fabric 1.2
2018-09-22 09:54:44 +08:00
Ubuntu 71a090d015 Use fabric ca to bootstrap fabric 1.2
Signed-off-by: Shuo Wang <shuo.wang94@gmail.com>
2018-09-21 12:20:57 +00:00
Baohua Yang f2ac48f3b1 Update base image to v0.4.11 2018-09-17 10:44:09 +08:00
Baohua Yang 85d330dfc9 Merge branch 'master' of github.com:yeasy/docker-compose-files 2018-09-11 10:51:25 +08:00
Baohua Yang 160b4591bb Add new eventsclient 2018-09-11 10:51:20 +08:00
Baohua Yang f10bf21bbf
Merge pull request #124 from ThijsdenBraver/patch-1
Fix typo in docker-compose.yml
2018-09-10 21:37:12 +08:00
ThijsdenBraver 1a6065ff2d
fixed typo in docker-compose.yml 2018-09-10 14:00:47 +02:00
Baohua Yang c8ff0404b5 Update with latest configtx 2018-09-10 14:22:00 +08:00
Baohua Yang a666b44664 Update from latest 2018-08-29 14:52:32 +08:00
Baohua Yang beb7610d52 Finish sidedb feature 2018-08-27 10:52:46 +08:00
Baohua Yang 78a440936b Fix collection config 2018-08-22 17:39:54 +08:00
Baohua Yang ab71081372 Add side-DB testing 2018-08-22 17:27:45 +08:00
Baohua Yang 6e96f4eaf7 Update process 2018-08-20 15:28:43 +08:00
Baohua Yang 43e32414c5 Add elk case 2018-08-17 10:11:05 -07:00
Baohua Yang f05cd6ccf8 Minor update 2018-08-03 13:11:50 +08:00
Baohua Yang a6f3639c91 Add jq in setup 2018-07-09 13:04:16 +08:00
Baohua Yang 8709ca57fb Add fabric v1.2.0 2018-07-04 17:16:42 +08:00
Baohua Yang 2df08e1d7e
Merge pull request #121 from ShuoWangNSL/master
Delete trailing whitespace
2018-07-02 05:42:54 -07:00
Shuo Wang 6e556fa7ed Delete trailing whitespace 2018-06-28 19:26:00 +00:00
Baohua Yang 3d39afc6dd Update kafka mode files 2018-06-22 22:03:28 +08:00
Baohua Yang 4f40250603 Run config gen inside container with script 2018-06-19 16:59:23 +08:00
Baohua Yang f98590354a Add channel get info and list 2018-06-19 10:01:32 +08:00
Baohua Yang b64fc2ebd8 Fix channel tx file name 2018-06-07 14:36:58 +08:00
Baohua Yang 620e38e92f Minor fix 2018-06-07 14:34:24 +08:00
Baohua Yang 0056c7f50f Passed latest code 2018-05-18 19:33:16 +08:00
Baohua Yang de2f26fc85 Add fabric 1.1.0 release 2018-04-03 09:17:48 +08:00
Baohua Yang aec5149c25
Merge pull request #117 from Geethree/master
Update mongodb cluster config to use hostnames
2018-03-28 21:56:36 +08:00
geethree ac9332f374 When using the appropriate compose format, hostnames resolve automagically via dockers internal container network dns. 2018-03-26 18:26:21 -07:00
Baohua Yang 6197d981d8 Update scripts 2018-03-05 14:10:16 +08:00
Baohua Yang d18171625a Add 1.1.0-rc1 2018-03-05 13:53:21 +08:00
Baohua Yang e4df9575a8 Allow setting cc param from global 2018-03-01 09:49:26 +08:00
Baohua Yang 8cefe53fff Add v1.0.6 2018-02-27 12:51:06 +08:00
Baohua Yang 5cb709c43a Fix #113: wrong image name 2018-02-22 16:00:43 +08:00