Minor update

hyperledger/1.0.2/base.yaml

@@ -8,9 +8,9 @@ version: '2'
 
 services:
   ca-base:
-    #image: hyperledger/fabric-ca:1.0.2
-    image: yeasy/hyperledger-fabric-ca:1.0.2
-    #image: hyperledger/fabric-ca:x86_64-1.0.2
+    #image: yeasy/hyperledger-fabric-ca:1.0.2
+    image: hyperledger/fabric-ca:x86_64-1.0.2
+    restart: always
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_TLS_ENABLED=true
@@ -18,6 +18,7 @@ services:
   orderer-base:
     #image: yeasy/hyperledger-fabric-orderer:1.0.2
     image: hyperledger/fabric-orderer:x86_64-1.0.2
+    restart: always
     environment:
       - ORDERER_GENERAL_LOGLEVEL=DEBUG
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -41,14 +42,13 @@ services:
     command: orderer start
 
   peer-base:
-    #image: yeasy/hyperledger-fabric-peer:1.0.2
-    image: hyperledger/fabric-peer:x86_64-1.0.2
+    image: yeasy/hyperledger-fabric:1.0.2
+    #image: hyperledger/fabric-peer:x86_64-1.0.2
+    restart: always
     environment:
-     #- CORE_PEER_ID=peer0
       - CORE_PEER_ADDRESSAUTODETECT=false
       - CORE_LOGGING_LEVEL=DEBUG
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=102_default  # uncomment this to use specific network
-     #- CORE_PEER_NETWORKID=dev
       - CORE_PEER_GOSSIP_USELEADERELECTION=true
       - CORE_PEER_GOSSIP_ORGLEADER=false  # this node is the group leader, default to false
       - CORE_PEER_PROFILE_ENABLED=false
@@ -76,6 +76,7 @@ services:
   cli-base:
     #image: yeasy/hyperledger-fabric:1.0.2
     image: hyperledger/fabric-tools:x86_64-1.0.2
+    restart: always
     tty: true
     environment:
       #- GOPATH=/opt/gopath
@@ -89,5 +90,6 @@ services:
   couchdb-base:
     #container_name: couchdb0
     image: hyperledger/fabric-couchdb:x86_64-1.0.2
+    restart: always
     # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service,
     # for example map it to utilize Fauxton User Interface in dev environments.

hyperledger/1.0.2/docker-compose-1orgs-1peers-dev.yaml

@@ -46,10 +46,6 @@ services:
     command: bash -c 'bash /tmp/peer_build.sh; peer node start'
 
   cli:
-    #extends:
-    #  file: peer-base-dev.yaml
-    #  service: peer-base
-    #image: yeasy/hyperledger-fabric:1.0.2
     extends:
       file: base-dev.yaml
       service: cli-base

hyperledger/1.0.2/docker-compose-2orgs-4peers-event.yaml

@@ -43,42 +43,11 @@ services:
       service: peer1.org2.example.com
 
   cli:
-    container_name: fabric-cli
-    hostname: fabric-cli
-    image: yeasy/hyperledger-fabric:1.0.2
-    tty: true
+    extends:
+      file: docker-compose-base.yaml
+      service: cli
     environment:
-      - CORE_PEER_ID=fabric-cli
-      - CORE_LOGGING_LEVEL=DEBUG
-      - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 # default to operate on peer0.org1
-      - CORE_PEER_LOCALMSPID=Org1MSP
       - CORE_PEER_TLS_ENABLED=false  # event-listener doesn't support TLS
-      - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt
-      - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key
-      - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
-      - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
-    volumes:
-        #- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
-        - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
-        - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
-        - ./e2e_cli/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts
-        - ./e2e_cli/crypto-config:/etc/hyperledger/fabric/crypto-config
-        - ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
-        - ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/peer/crypto-config.yaml
-    depends_on:
-      - orderer.example.com
-      - peer0.org1.example.com
-      - peer1.org1.example.com
-      - peer0.org2.example.com
-      - peer1.org2.example.com
-    links:
-      - orderer.example.com
-      - peer0.org1.example.com
-      - peer1.org1.example.com
-      - peer0.org2.example.com
-      - peer1.org2.example.com
-    working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
-    command: bash -c 'while true; do sleep 20170504; done'
 
   event-listener:
     container_name: fabric-event-listener
@@ -98,24 +67,19 @@ services:
     volumes:
         #- ./e2e_cli/examples:/opt/gopath/src/github.com/hyperledger/fabric/examples
         - ./e2e_cli/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/
-        - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
         - ./e2e_cli/channel-artifacts:/opt/gopath/src/github.com/hyperledger/fabric/peer/channel-artifacts
         - ./e2e_cli/configtx.yaml:/etc/hyperledger/fabric/configtx.yaml
         - ./e2e_cli/crypto-config.yaml:/etc/hyperledger/fabric/crypto-config.yaml
+        - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/
     depends_on:
       - orderer.example.com
       - peer0.org1.example.com
       - peer1.org1.example.com
       - peer0.org2.example.com
       - peer1.org2.example.com
-    links:
-      - orderer.example.com
-      - peer0.org1.example.com
-      - peer1.org1.example.com
-      - peer0.org2.example.com
-      - peer1.org2.example.com
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
-    command: bash -c 'block-listener -events-address=peer0.org1.example.com:7053 -events-mspdir=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/ -events-mspid=Org1MSP'
+    #command: bash -c 'block-listener -events-address=peer0.org1.example.com:7053 -events-mspdir=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/ -events-mspid=Org1MSP'
+    command: bash -c 'while true; do sleep 20170504; done'
 
 #networks:
 #  default: