Baohua Yang
568ece3e41
Move crypto-config to upper level
2018-01-30 15:54:49 +08:00
Baohua Yang
4da5d41015
Add fabric v1.1.0-alpha
2018-01-29 11:01:25 +08:00
Baohua Yang
fb2ca79c3d
Fix config
2018-01-28 20:52:21 +08:00
Baohua Yang
3dbc7b7826
Update config tool version
2018-01-28 20:41:49 +08:00
Baohua Yang
276dd7cbcb
Remove v1.0.4
2018-01-28 19:43:46 +08:00
Baohua Yang
2d704bb518
Update structure to move example outside
2018-01-23 17:53:52 +08:00
Baohua Yang
5f36bbfc0c
Fix issue #109 : use correct compose config and image
2018-01-19 19:37:27 +08:00
Baohua Yang
65a648e29e
Clean up code
2018-01-18 17:33:15 +08:00
Baohua Yang
b4a4c23247
Fix output msg
2018-01-18 13:31:00 +08:00
Baohua Yang
636d561928
Fix bootstrap peer
2018-01-14 19:49:20 +08:00
Baohua Yang
7875441ad4
Start config generation
2018-01-13 03:06:28 -08:00
Baohua Yang
47c185538b
Update explorer artifacts path
2018-01-12 22:32:27 -08:00
Baohua Yang
6bbb59a8df
Add more chaincodes
2018-01-05 14:37:52 +08:00
Baohua Yang
96b581a923
Move example path outside
2018-01-05 14:02:41 +08:00
Baohua Yang
ae342ef96b
Update chaincode name more speficicly
2018-01-05 12:47:35 +08:00
Baohua Yang
adb7753e6f
Add more chaincode examples
2018-01-05 10:53:21 +08:00
Baohua Yang
0738e46b78
Update blocks
2018-01-04 11:21:19 +08:00
Baohua Yang
3cdba26a8a
Fix kafka mode to use latest structure
2018-01-03 21:28:04 +08:00
Baohua Yang
80ef40b81a
Fix to use latest structure
2018-01-03 21:19:09 +08:00
Baohua Yang
9c7769d290
Update mode path to solo
2018-01-03 15:15:57 +08:00
Baohua Yang
084bb5d1fe
Update new blocks
2018-01-02 16:49:51 +08:00
Baohua Yang
fa4cc269b0
Update v1.0.5 scripts
2017-12-29 22:29:56 +08:00
Baohua Yang
26ef2bcc5c
Enable update channel with kafka mode
2017-12-29 21:59:28 +08:00
Baohua Yang
8732d2ffc1
Enable update channel by adding new org
2017-12-29 21:52:46 +08:00
Baohua Yang
0c25edd0c8
Merge branch 'master' of github.com:yeasy/docker-compose-files
2017-12-26 13:28:06 +08:00
Baohua Yang
5dc232df27
Add new org support
2017-12-26 13:28:02 +08:00
Baohua Yang
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
Baohua Yang
6b93e470e7
Update config
2017-12-25 10:32:07 +08:00
Baohua Yang
60e72502e9
Generate artifacts for new org
2017-12-25 10:28:59 +08:00
Naoya Horiguchi
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
Baohua Yang
f4f56c90b1
Map crypto-config to default config path
2017-12-19 15:09:40 +08:00
Baohua Yang
1aaca144a3
Update struct
2017-12-19 14:40:39 +08:00
Baohua Yang
345f76116e
Update scripts with latest image testing
2017-12-15 12:05:12 +08:00
Baohua Yang
a9f99623ed
Let gen_config detect existing materials
2017-12-12 22:47:40 +08:00
Baohua Yang
752a51446b
Update with new configtx.yaml
2017-12-07 14:18:16 +08:00
Baohua Yang
09b0726eae
Fix docs and scripts
2017-12-07 13:55:24 +08:00
Baohua Yang
1a66a9efa8
Add fabric v1.0.5
2017-12-07 13:55:11 +08:00
Baohua Yang
480a53e904
Remove fabric v1.0.3
2017-12-07 13:47:00 +08:00
Baohua Yang
03d039a00d
Add fabric 1.0.5
2017-12-07 10:54:06 +08:00
Baohua Yang
a5a0ef47fa
Minor fix
2017-12-06 22:33:08 +08:00
Baohua Yang
8d4b551fc1
passed with latest code
2017-12-06 22:30:57 +08:00
Baohua Yang
8585c03dc7
Fix while checking
2017-12-06 16:50:55 +08:00
Baohua Yang
7ad4f7d6e1
Rename channel name to app channel
2017-12-06 16:24:33 +08:00
Baohua Yang
271918b5a9
Add config blocks and logs
2017-12-05 17:17:05 +08:00
Baohua Yang
2a766316b5
Use orderer org to fetch blocks
2017-12-02 09:36:01 +08:00
Baohua Yang
0f2bb6d5fa
Finish configtxlator usage
2017-12-01 23:11:37 +08:00
Baohua Yang
8adc5d79a7
Update configtxlator operations
2017-12-01 17:34:21 +08:00
Baohua Yang
f7b2c043f7
Update example code
2017-11-29 21:06:41 +08:00
Baohua Yang
051e5d6bf5
Update chaincode path
2017-11-29 20:20:01 +08:00
Baohua Yang
85bbbf058a
Start reconfiguration demo
2017-11-26 19:50:49 +08:00