Commit Graph

145 Commits (facb83948e70cda8a6255ac9e37e031503533d59)

Author SHA1 Message Date
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
qiang0723 7f01556fba Add usage of cryptogen and configtxgen 2017-05-18 17:12:14 +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
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
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
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
qiang0723 9726570334 add new-channel-auto-test.sh script 2017-04-14 12:08:18 +08:00
qiang0723 69e5de95c4 Enable cc operation on default channel testchainid 2017-04-11 12:11:41 +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 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
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
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
icodezjb c51de1f901 Update docker-compose.yml
modify the error “fabric-ca server” to "fabric-ca-server"
2017-03-20 19:48:19 +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
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
qiang0723 c1a844305b update README.md 2017-02-21 10:44:41 +08:00
qiang0723 4b0d8ff15d modify the images tag to 0.8.3 2017-02-20 13:12:36 +08:00
Baohua Yang 810c09ce32 Minor update doc 2017-02-20 11:20:13 +08:00
Baohua Yang 41d548d8d6 Resolve merge conflict 2017-02-20 11:19:09 +08:00
Baohua Yang 5c88f801a7 Use version env variables 2017-02-20 11:17:39 +08:00
Baohua Yang 51d5b64e07 Use version env variables 2017-02-20 09:30:36 +08:00
qiang0723 81915af46e Fix issue #15:modify format and layout 2017-02-16 17:23:39 +08:00
qiang0723 0f6d673981 Fix issue #15: change commad deploy to install/instantive 2017-02-16 15:10:12 +08:00
Baohua Yang 9c50f1e4cf Update with latest code 2017-02-08 15:45:46 +08:00
Baohua Yang 59433b4189 Use fabric-ca image to replace fabric-cop 2017-01-24 10:24:12 +08:00
Baohua Yang 10b1a4e87c Update docs 2017-01-06 07:44:26 +08:00
Baohua Yang a5801392cf Update docs 2017-01-04 15:01:42 +08:00
Baohua Yang 7bc01335e2 Add 1.0 scripts 2017-01-04 14:54:05 +08:00
Baohua Yang aa329b3344 Update option orders 2016-12-23 15:49:54 +08:00
Baohua Yang 843586bca5 Fix Docker image name 2016-12-09 15:36:59 +08:00
Baohua Yang ef41477a80 Add more operation links 2016-12-08 17:20:35 +08:00
Baohua Yang 340bef7640 Refine quick start script 2016-12-08 17:15:54 +08:00
Baohua Yang b6445aa698 Refine structure and docs 2016-12-08 16:03:52 +08:00
Baohua Yang 587c5b7c51 Fix network usage config and doc 2016-12-07 18:53:35 +08:00
Baohua Yang 42038cf74e Refine the docs 2016-12-07 17:05:52 +08:00
Baohua Yang 4e0683f31b Add hyperledger with blockchain-explorer project 2016-11-18 17:18:41 +08:00
Baohua Yang f870b623a2 Use 0.6-dp in the setup script 2016-10-16 08:46:52 +08:00
Baohua Yang b50b1baa48 Update default image tag to 0.6-dp 2016-10-12 21:58:17 +08:00
Baohua Yang 4293e017af Update with new unique docker image 2016-09-24 11:37:44 +08:00
Baohua Yang fd0c327de0 Merge branch 'master' of github.com:yeasy/docker-compose-files 2016-09-14 16:58:09 +08:00
Baohua Yang d053f8fd5f Update with more example operations 2016-09-14 16:58:02 +08:00
wezxll 85c677a8bf add apt-get update, renew docker-compose version 2016-08-10 18:38:34 +08:00
Baohua Yang 3bb4712579 Enable booting delay with CA by default 2016-08-04 16:26:27 +08:00
Baohua Yang 1828f21eac update with ca node 2016-08-04 11:01:49 +08:00
Baohua Yang 5203474de1 Update with last service port 2016-08-02 08:41:16 +08:00
Baohua Yang 46c89f380e Add script link 2016-07-23 17:09:42 +08:00
swb d41eca141a setup pbft cluster file 2016-07-22 18:44:51 +08:00
swb eb77932328 Update setupPbft.sh 2016-07-22 18:31:58 +08:00
swb d3cdb50c63 Create setupPbft.sh 2016-07-22 18:25:21 +08:00
Baohua Yang 734e731f63 Update supported pbft modes 2016-06-29 11:45:46 +08:00
Baohua Yang 301b370a1b support new config name 2016-06-24 19:22:36 +08:00
Baohua Yang 2ca08915ab update compose files 2016-06-18 15:55:38 +08:00
Baohua Yang cd8f5af7fc update according to latest code 2016-05-13 10:51:33 +08:00
Baohua Yang 5ecbbf7a84 latest code only support pbft 2016-05-09 10:44:16 +08:00
Baohua Yang a175c5c9cc Add vairous consensus support 2016-05-06 16:11:14 +08:00
Chang Chen 38fc881422 Update hyperledger/compose-defaults.yml
Track config changes in hyperledger fabric
2016-05-06 15:53:27 +08:00
Baohua Yang d431dc02ff Add more doc 2016-04-28 09:59:57 +08:00
Baohua Yang c80ea4e876 Add dependency doc 2016-04-28 09:57:29 +08:00
Baohua Yang 2904d25acd fix to work with latest image 2016-04-21 15:18:30 +08:00
Baohua Yang 2bc76e5063 add missing word 2016-04-21 13:53:56 +08:00
Baohua Yang 1d74a14666 Add member service support 2016-04-20 14:58:38 +08:00
Baohua Yang 8b94988e85 Fix link 2016-04-20 11:07:30 +08:00
Baohua Yang 70b94eb56f Add more hyperledger descriptions 2016-04-18 14:19:35 +08:00
Baohua Yang 6db52f9528 Add hyperledger cluster 2016-04-15 16:45:57 +08:00