[CE-225] Fix explorer version error

1. Use yeasy/blockchain-explorer:0.1.0-preview as default image. 2. Cli join all peers into bussinesschannel after container start. Change-Id: Ica09b5b2e0bb076d91a5dcf56fefbc430505bd2f Signed-off-by: Luke <jiahaoc@vmware.com>
hyperledger-cello · Jan 12, 2018 · 2cd24d6 · 2cd24d6
1 parent bf06e57
commit 2cd24d6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 38 deletions.
diff --git a/src/agent/docker/_compose_files/fabric-1.0/local/explorer-artifacts/config.json b/src/agent/docker/_compose_files/fabric-1.0/local/explorer-artifacts/config.json
@@ -1,14 +1,8 @@
 {
    "network-config": {
-      "orderer": [{
-         "url": "grpcs://orderer.example.com:7050",
-         "server-hostname": "orderer.example.com",
-         "tls_cacerts": "/first-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt"
-      }],
       "org1": {
          "name": "peerOrg1",
          "mspid": "Org1MSP",
-         "ca": "http://ca.org1.example.com:7054",
          "peer1": {
             "requests": "grpcs://peer0.org1.example.com:7051",
             "events": "grpcs://peer0.org1.example.com:7053",
@@ -29,7 +23,6 @@
       "org2": {
         "name": "peerOrg2",
         "mspid": "Org2MSP",
-        "ca": "http://ca.org2.example.com:7054",
         "peer1": {
            "requests": "grpcs://peer0.org2.example.com:7051",
            "events": "grpcs://peer0.org2.example.com:7053",
@@ -54,15 +47,6 @@
    "GOPATH":"/opt/gopath",
    "keyValueStore":"/tmp/fabric-client-kvs",
    "eventWaitTime":"30000",
-   "peer":"peer1",
-   "org":["org1", "org2"],
-   "enableTls":true,
-   "users":[
-      {
-         "username":"admin",
-         "secret":"adminpw"
-      }
-   ],
    "mysql":{
       "host":"mysql",
       "port":"3306",

diff --git a/src/agent/docker/_compose_files/fabric-1.0/local/fabric-solo-4.yaml b/src/agent/docker/_compose_files/fabric-1.0/local/fabric-solo-4.yaml
@@ -281,11 +281,11 @@ services:
       - peer0.org2.example.com
       - peer1.org2.example.com
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
-    #command: bash -c 'sleep 2; bash ./scripts/initialize.sh; while true; do sleep 20170504; done'
-    command: bash -c 'sleep 2; while true; do sleep 20170504; done'
+    command: bash -c 'sleep 2; bash ./scripts/initialize.sh; while true; do sleep 20170504; done'
+    #command: bash -c 'sleep 2; while true; do sleep 20170504; done'
 
   explorer:
-    image: yeasy/blockchain-explorer:latest
+    image: yeasy/blockchain-explorer:0.1.0-preview
     container_name: ${COMPOSE_PROJECT_NAME}_explorer
     hostname: explorer
     volumes:

diff --git a/src/agent/docker/_compose_files/fabric-1.0/local/scripts/initialize.sh b/src/agent/docker/_compose_files/fabric-1.0/local/scripts/initialize.sh
@@ -160,25 +160,6 @@ updateAnchorPeers 0
 echo_b "Updating anchor peers for org2..."
 updateAnchorPeers 2
 
-## Install chaincode on Peer0/Org1 and Peer2/Org2
-echo_b "Installing chaincode on org1/peer0..."
-installChaincode 0
-
-echo_b "Install chaincode on org1/peer1..."
-installChaincode 1
-
-echo_b "Install chaincode on org2/peer0..."
-installChaincode 2
-
-echo_b "Install chaincode on org2/peer1..."
-installChaincode 3
-
-# Instantiate chaincode on Peer0/Org2
-# Instantiate can only be executed once on any node
-echo_b "Instantiating chaincode on peer0/org2..."
-instantiateChaincode 2
-
-
 echo
 echo_g "===================== All GOOD, initialization completed ===================== "
 echo