From 229b5c249458110a9410fe526c9658ec6925c48d Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Mon, 11 Sep 2017 16:43:17 +0800 Subject: [PATCH] Minor fix usage --- hyperledger/1.0.2/Makefile | 8 +++++++- hyperledger/1.0.2/docker-compose-dev.yaml | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/hyperledger/1.0.2/Makefile b/hyperledger/1.0.2/Makefile index 2ad1bf72..2bb82be2 100644 --- a/hyperledger/1.0.2/Makefile +++ b/hyperledger/1.0.2/Makefile @@ -137,6 +137,12 @@ clean: # clean up environment cli: # enter the cli container docker exec -it fabric-cli bash +peer: # enter the peer container + docker exec -it peer0.org1.example.com bash + +dev_compile: # rebuild the peer + docker exec -it peer0.org1.example.com bash /tmp/peer_build.sh + ps: # show existing docker images docker ps -a @@ -148,4 +154,4 @@ dev_logs: # show dev logs logs_check: # show logs docker logs peer0.org1.example.com >& /tmp/dev_peer.log - vim /tmp/dev_peer.log + less /tmp/dev_peer.log diff --git a/hyperledger/1.0.2/docker-compose-dev.yaml b/hyperledger/1.0.2/docker-compose-dev.yaml index f3293372..d688fbec 100644 --- a/hyperledger/1.0.2/docker-compose-dev.yaml +++ b/hyperledger/1.0.2/docker-compose-dev.yaml @@ -8,16 +8,16 @@ version: '2.0' services: - ca.example.com: # not used currently - extends: - file: base.yaml - service: ca-base - container_name: ca.example.com - hostname: ca.example.com - # command: /go/src/github.com/hyperledger/fabric-ca/bin/ca server start -ca testdata/ec.pem -ca-key testdata/ec-key.pem -config testdata/testconfig.json - ports: - - "7054:7054" - command: fabric-ca-server start -b admin:adminpw +# ca.example.com: # not used currently +# extends: +# file: base.yaml +# service: ca-base +# container_name: ca.example.com +# hostname: ca.example.com +# # command: /go/src/github.com/hyperledger/fabric-ca/bin/ca server start -ca testdata/ec.pem #-ca-key testdata/ec-key.pem -config testdata/testconfig.json +# ports: +# - "7054:7054" +# command: fabric-ca-server start -b admin:adminpw orderer.example.com: # There can be multiple orderers extends: