yeasy
/
docker-compose-files
mirror of https://github.com/yeasy/docker-compose-files.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
363 Commits
12 Branches
0 Tags
224 MiB
Commit Graph

363 Commits (f05cd6ccf85e498651b4b2ea340883b7d562988b)
 

Author SHA1 Message Date
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
Baohua Yang 27f16a79f6 Rename artifacts to solo 2017-11-26 18:32:56 +08:00
Baohua Yang 280754881c Fix #105: add missing artifacts 2017-11-26 18:29:14 +08:00
Baohua Yang 03156909b8 Split test cases 2017-11-24 14:45:16 +08:00
Baohua Yang 6e702e77f3 Simplify setEnvs func 2017-11-24 13:43:57 +08:00
Baohua Yang 5a069caac9 Use explicit set env func 2017-11-23 22:22:20 +08:00
Baohua Yang 466e37cad0 Fix while loop bug 2017-11-23 17:17:29 +08:00
Baohua Yang 504a7ab857 Fix missing fi 2017-11-23 13:21:35 +08:00
Baohua Yang f409d9c527 Start with blockchain-explorer support 2017-11-17 22:04:18 +08:00
Baohua Yang fcff2a844b update scripts 2017-11-15 14:46:12 +08:00
Baohua Yang f07362d832 Support func params 2017-11-14 15:29:27 +08:00
Baohua Yang 450aae69a4 Split testing scripts 2017-11-06 12:18:37 +08:00
Baohua Yang 95dd1431e2 Fix #104: Remove unused files 2017-11-03 16:41:57 +08:00
Baohua Yang c485d7a820 Add event support 2017-11-02 11:31:08 +08:00
Baohua Yang 56015db2d0 Remove unused e2e staff 2017-11-02 10:29:33 +08:00
Baohua Yang e6c4c8232e Support fabric 1.0.4 now 2017-11-02 10:19:05 +08:00
Baohua Yang e88a8b3118 Minor fix 2017-11-02 10:18:43 +08:00
Baohua Yang 93a75e304f Rename 0.6 and 1.0 to precise version 2017-11-02 10:15:49 +08:00
Baohua Yang 906b5edbd9 Fix bugs, now passed all modes 2017-11-01 22:17:36 +08:00
Baohua Yang c20d68b183 Add missing files 2017-11-01 20:26:11 +08:00
Baohua Yang 05b6b6382c Fix channel create param missing 2017-11-01 20:25:40 +08:00
Baohua Yang c138ea3aaf Update file names 2017-11-01 20:12:59 +08:00
Baohua Yang fce22758d9 Update configs 2017-11-01 19:54:13 +08:00
Baohua Yang 8e9bf1bc94 Rename e2e to solo 2017-11-01 16:41:41 +08:00
Baohua Yang bc4a605e0b Add dev mode support 2017-10-27 23:41:13 -07:00
Baohua Yang 2575d1054d Update hyperledger fabric name in README 2017-10-25 22:16:13 -07:00