Commit Graph

11 Commits (21968059e2a6cb879318604ac704dab41693a862)

Author SHA1 Message Date
Baohua Yang 21968059e2 Move crypto-config to upper level 2018-01-30 16:29:57 +08:00
Baohua Yang fb2ca79c3d Fix config 2018-01-28 20:52:21 +08:00
Baohua Yang 2d704bb518 Update structure to move example outside 2018-01-23 17:53:52 +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 8732d2ffc1 Enable update channel by adding new org 2017-12-29 21:52:46 +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 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 1a66a9efa8 Add fabric v1.0.5 2017-12-07 13:55:11 +08:00
Baohua Yang 03d039a00d Add fabric 1.0.5 2017-12-07 10:54:06 +08:00