Commit Graph

305 Commits (a9f99623ed2d0aec10b9a9c46d60e1d9c85f2d37)
 

Author SHA1 Message Date
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
qiang0723 c1a844305b update README.md 2017-02-21 10:44:41 +08:00
Baohua Yang 3368d46197 Merge pull request #18 from qiang0723/master
Update the images tag to 0.8.3
2017-02-20 14:42:22 +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
Baohua Yang 33251da6fc Merge pull request #17 from qiang0723/master
Update operation steps and the setup script
2017-02-16 22:57:21 +08:00
qiang0723 81915af46e Fix issue #15:modify format and layout 2017-02-16 17:23:39 +08:00
Baohua Yang 5a4c6b09fe Merge pull request #16 from qiang0723/master
Fix issue #15: Update images's tag and deploy command
2017-02-16 16:13:11 +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
Baohua Yang ea4234f1d6 Merge pull request #4 from wezxll/master
Add apt-get update and use latest docker-compose version
2016-08-10 21:22:00 +08:00
wezxll 85c677a8bf add apt-get update, renew docker-compose version 2016-08-10 18:38:34 +08:00