86f0642d20
Merge pull request #127 from ShuoWangNSL/master
...
Removed unused code.
2018-10-12 22:06:43 +08:00
919364efcf
Refine code in fabric-ca
2018-10-12 06:41:57 -07:00
5b742d284a
Merge branch 'master' of github.com:yeasy/docker-compose-files
2018-10-12 21:31:25 +08:00
0115e8175c
Generated credential's cn has no suffix
2018-10-12 21:31:06 +08:00
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
593f88c33f
Use configtxlator cmd instead of REST
2018-10-12 11:33:24 +08:00
8f408e55e3
Support 2 orderers in kafka mode
2018-10-11 22:29:09 +08:00
49868aa5ad
Finish v1.3.0 testing
2018-10-11 13:55:49 +08:00
afaa0195f9
Add v1.3.0
2018-10-11 13:53:01 +08:00
8c92d1c0f1
Start ca test
2018-10-10 17:18:00 +08:00
43acba7867
Update baseimage to 0.4.13
2018-10-09 14:04:05 +08:00
826bd8ea9d
Fix convert to json issue
2018-10-09 14:02:33 +08:00
0499580071
Merge branch 'master' of github.com:yeasy/docker-compose-files
2018-09-29 17:44:44 +08:00
22c7152d23
Verify with latest code
2018-09-29 17:44:36 +08:00
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
f2ac48f3b1
Update base image to v0.4.11
2018-09-17 10:44:09 +08:00
160b4591bb
Add new eventsclient
2018-09-11 10:51:20 +08:00
c8ff0404b5
Update with latest configtx
2018-09-10 14:22:00 +08:00
a666b44664
Update from latest
2018-08-29 14:52:32 +08:00
beb7610d52
Finish sidedb feature
2018-08-27 10:52:46 +08:00
78a440936b
Fix collection config
2018-08-22 17:39:54 +08:00
ab71081372
Add side-DB testing
2018-08-22 17:27:45 +08:00
6e96f4eaf7
Update process
2018-08-20 15:28:43 +08:00
f05cd6ccf8
Minor update
2018-08-03 13:11:50 +08:00
a6f3639c91
Add jq in setup
2018-07-09 13:04:16 +08:00
8709ca57fb
Add fabric v1.2.0
2018-07-04 17:16:42 +08:00
6e556fa7ed
Delete trailing whitespace
2018-06-28 19:26:00 +00:00
3d39afc6dd
Update kafka mode files
2018-06-22 22:03:28 +08:00
4f40250603
Run config gen inside container with script
2018-06-19 16:59:23 +08:00
f98590354a
Add channel get info and list
2018-06-19 10:01:32 +08:00
b64fc2ebd8
Fix channel tx file name
2018-06-07 14:36:58 +08:00
620e38e92f
Minor fix
2018-06-07 14:34:24 +08:00
0056c7f50f
Passed latest code
2018-05-18 19:33:16 +08:00
de2f26fc85
Add fabric 1.1.0 release
2018-04-03 09:17:48 +08:00
6197d981d8
Update scripts
2018-03-05 14:10:16 +08:00
d18171625a
Add 1.1.0-rc1
2018-03-05 13:53:21 +08:00
e4df9575a8
Allow setting cc param from global
2018-03-01 09:49:26 +08:00
8cefe53fff
Add v1.0.6
2018-02-27 12:51:06 +08:00
5cb709c43a
Fix #113 : wrong image name
2018-02-22 16:00:43 +08:00
346b8e3083
Fix query bug
2018-02-08 21:23:37 +08:00
dfffd15528
remove unused flags
2018-02-08 10:33:23 +08:00
f7f5d3fcf4
Fix crypto config path
2018-02-04 15:09:18 +08:00
5b647c15d4
Move crypto-config to upper level
2018-01-30 17:01:41 +08:00
21968059e2
Move crypto-config to upper level
2018-01-30 16:29:57 +08:00
cb1d8f9495
Move crypto-config to upper level
2018-01-30 16:12:23 +08:00
568ece3e41
Move crypto-config to upper level
2018-01-30 15:54:49 +08:00
4da5d41015
Add fabric v1.1.0-alpha
2018-01-29 11:01:25 +08:00
fb2ca79c3d
Fix config
2018-01-28 20:52:21 +08:00
3dbc7b7826
Update config tool version
2018-01-28 20:41:49 +08:00
276dd7cbcb
Remove v1.0.4
2018-01-28 19:43:46 +08:00
2d704bb518
Update structure to move example outside
2018-01-23 17:53:52 +08:00
5f36bbfc0c
Fix issue #109 : use correct compose config and image
2018-01-19 19:37:27 +08:00
65a648e29e
Clean up code
2018-01-18 17:33:15 +08:00
b4a4c23247
Fix output msg
2018-01-18 13:31:00 +08:00
636d561928
Fix bootstrap peer
2018-01-14 19:49:20 +08:00
7875441ad4
Start config generation
2018-01-13 03:06:28 -08:00
47c185538b
Update explorer artifacts path
2018-01-12 22:32:27 -08:00
6bbb59a8df
Add more chaincodes
2018-01-05 14:37:52 +08:00
96b581a923
Move example path outside
2018-01-05 14:02:41 +08:00
ae342ef96b
Update chaincode name more speficicly
2018-01-05 12:47:35 +08:00
adb7753e6f
Add more chaincode examples
2018-01-05 10:53:21 +08:00
0738e46b78
Update blocks
2018-01-04 11:21:19 +08:00
3cdba26a8a
Fix kafka mode to use latest structure
2018-01-03 21:28:04 +08:00
80ef40b81a
Fix to use latest structure
2018-01-03 21:19:09 +08:00
9c7769d290
Update mode path to solo
2018-01-03 15:15:57 +08:00
084bb5d1fe
Update new blocks
2018-01-02 16:49:51 +08:00
fa4cc269b0
Update v1.0.5 scripts
2017-12-29 22:29:56 +08:00
26ef2bcc5c
Enable update channel with kafka mode
2017-12-29 21:59:28 +08:00
8732d2ffc1
Enable update channel by adding new org
2017-12-29 21:52:46 +08:00
0c25edd0c8
Merge branch 'master' of github.com:yeasy/docker-compose-files
2017-12-26 13:28:06 +08:00
5dc232df27
Add new org support
2017-12-26 13:28:02 +08:00
996d888c1e
Merge pull request #108 from Naoya-Horiguchi/dev/fix_error_msg_in_make_clean
...
Fix error messages in make clean
2017-12-25 21:17:37 +08:00
6b93e470e7
Update config
2017-12-25 10:32:07 +08:00
60e72502e9
Generate artifacts for new org
2017-12-25 10:28:59 +08:00
e545919108
Fix error messages in make clean
...
"make clean" emits the following error message:
root@ubuntu:~/docker-compose-files/hyperledger_fabric/v1.0.5# make clean
Clean all HLF containers and fabric cc images
awk: cmd. line:1: { print , }
awk: cmd. line:1: ^ syntax error
awk: cmd. line:1: { print , }
awk: cmd. line:1: ^ syntax error
awk: cmd. line:1: { print , }
awk: cmd. line:1: ^ unexpected newline or end of string
This is simply because $1 and $2 are not properly escaped.
And we have another messages like below:
"docker rm" requires at least 1 argument(s).
See 'docker rm --help'.
Usage: docker rm [OPTIONS] CONTAINER [CONTAINER...]
Remove one or more containers
Makefile:138: recipe for target 'clean' failed
make: [clean] Error 1 (ignored)
"docker rmi" requires at least 1 argument(s).
See 'docker rmi --help'.
Usage: docker rmi [OPTIONS] IMAGE [IMAGE...]
Remove one or more images
Makefile:138: recipe for target 'clean' failed
make: [clean] Error 1 (ignored)
If we have no target containers or images, we don't want to call docker
rm/rmi. xargs has -r option for this purpose, so let's turn it on.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
2017-12-25 09:59:09 +09:00
f4f56c90b1
Map crypto-config to default config path
2017-12-19 15:09:40 +08:00
1aaca144a3
Update struct
2017-12-19 14:40:39 +08:00
345f76116e
Update scripts with latest image testing
2017-12-15 12:05:12 +08:00
a9f99623ed
Let gen_config detect existing materials
2017-12-12 22:47:40 +08:00
752a51446b
Update with new configtx.yaml
2017-12-07 14:18:16 +08:00
09b0726eae
Fix docs and scripts
2017-12-07 13:55:24 +08:00
1a66a9efa8
Add fabric v1.0.5
2017-12-07 13:55:11 +08:00
480a53e904
Remove fabric v1.0.3
2017-12-07 13:47:00 +08:00
03d039a00d
Add fabric 1.0.5
2017-12-07 10:54:06 +08:00
a5a0ef47fa
Minor fix
2017-12-06 22:33:08 +08:00
8d4b551fc1
passed with latest code
2017-12-06 22:30:57 +08:00
8585c03dc7
Fix while checking
2017-12-06 16:50:55 +08:00
7ad4f7d6e1
Rename channel name to app channel
2017-12-06 16:24:33 +08:00
271918b5a9
Add config blocks and logs
2017-12-05 17:17:05 +08:00
2a766316b5
Use orderer org to fetch blocks
2017-12-02 09:36:01 +08:00
0f2bb6d5fa
Finish configtxlator usage
2017-12-01 23:11:37 +08:00
8adc5d79a7
Update configtxlator operations
2017-12-01 17:34:21 +08:00
f7b2c043f7
Update example code
2017-11-29 21:06:41 +08:00
051e5d6bf5
Update chaincode path
2017-11-29 20:20:01 +08:00
85bbbf058a
Start reconfiguration demo
2017-11-26 19:50:49 +08:00
27f16a79f6
Rename artifacts to solo
2017-11-26 18:32:56 +08:00
280754881c
Fix #105 : add missing artifacts
2017-11-26 18:29:14 +08:00
03156909b8
Split test cases
2017-11-24 14:45:16 +08:00
6e702e77f3
Simplify setEnvs func
2017-11-24 13:43:57 +08:00
5a069caac9
Use explicit set env func
2017-11-23 22:22:20 +08:00
466e37cad0
Fix while loop bug
2017-11-23 17:17:29 +08:00
504a7ab857
Fix missing fi
2017-11-23 13:21:35 +08:00
f409d9c527
Start with blockchain-explorer support
2017-11-17 22:04:18 +08:00
fcff2a844b
update scripts
2017-11-15 14:46:12 +08:00
f07362d832
Support func params
2017-11-14 15:29:27 +08:00
450aae69a4
Split testing scripts
2017-11-06 12:18:37 +08:00
95dd1431e2
Fix #104 : Remove unused files
2017-11-03 16:41:57 +08:00
c485d7a820
Add event support
2017-11-02 11:31:08 +08:00
56015db2d0
Remove unused e2e staff
2017-11-02 10:29:33 +08:00
e6c4c8232e
Support fabric 1.0.4 now
2017-11-02 10:19:05 +08:00
e88a8b3118
Minor fix
2017-11-02 10:18:43 +08:00
93a75e304f
Rename 0.6 and 1.0 to precise version
2017-11-02 10:15:49 +08:00
906b5edbd9
Fix bugs, now passed all modes
2017-11-01 22:17:36 +08:00
c20d68b183
Add missing files
2017-11-01 20:26:11 +08:00
05b6b6382c
Fix channel create param missing
2017-11-01 20:25:40 +08:00
c138ea3aaf
Update file names
2017-11-01 20:12:59 +08:00
fce22758d9
Update configs
2017-11-01 19:54:13 +08:00
8e9bf1bc94
Rename e2e to solo
2017-11-01 16:41:41 +08:00
bc4a605e0b
Add dev mode support
2017-10-27 23:41:13 -07:00
f05314a670
Fix issue #103 : wrong file name
2017-10-25 22:14:49 -07:00
7d176f7213
Add fabric in path to be more accurate
2017-10-25 17:51:37 -07:00
Baohua Yang
Shuo Wang
Shuo Wang
Ubuntu
Baohua Yang
Naoya Horiguchi