make fabric-ca network suitable for the desktop to use. blockchain-de…

…sktop#171 Signed-off-by: Yi DENG <[email protected]>
dengyi9 · Mar 14, 2019 · 1382181 · 1382181
1 parent 5319cb8
commit 1382181
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/fabric/v1.3/fabric-ca/desktopConfig.yaml b/fabric/v1.3/fabric-ca/desktopConfig.yaml
@@ -3,7 +3,8 @@ peerEventUrl: grpcs://localhost:7053
 ordererUrl: grpcs://localhost:7050
 mspId: org1MSP
 certificate: data/orgs/org1/admin/msp/signcerts/cert.pem
-privateKey: data/orgs/org1/admin/msp/keystore/6a65f3b294f455b1dc41bfec77da60ed86570cb5a342a21f052d3930d0d4f7c0_sk
+# FIXME: privateKey值目前每次重启fabric-ca网络需手动修改，待优化
+privateKey: data/orgs/org1/admin/msp/keystore/4c860ce32fe575f8d782ddbee2e1e086b4390fdd59f7b7fa2306ad521e64502b_sk
 peerTlsCaCert: data/org1-ca-chain.pem
 ordererTlsCaCert: data/org0-ca-chain.pem
 peerSslTarget: peer1-org1

diff --git a/fabric/v1.3/fabric-ca/docker-compose.yml b/fabric/v1.3/fabric-ca/docker-compose.yml
@@ -182,6 +182,8 @@ services:
       - ./data:/data
     networks:
       - fabric-ca
+    ports:
+      - 7050:7050
     depends_on:
       - setup
 
@@ -209,7 +211,7 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/data/org1-ca-chain.pem
-      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true
+      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=false
       - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/data/org1-ca-chain.pem
       - CORE_PEER_TLS_CLIENTCERT_FILE=/data/tls/peer1-org1-client.crt
       - CORE_PEER_TLS_CLIENTKEY_FILE=/data/tls/peer1-org1-client.key
@@ -227,6 +229,9 @@ services:
       - /var/run:/host/var/run
     networks:
       - fabric-ca
+    ports:
+      - 7051:7051
+      - 7053:7053
     depends_on:
       - setup
 
@@ -254,7 +259,7 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/data/org1-ca-chain.pem
-      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true
+      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=false
       - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/data/org1-ca-chain.pem
       - CORE_PEER_TLS_CLIENTCERT_FILE=/data/tls/peer2-org1-client.crt
       - CORE_PEER_TLS_CLIENTKEY_FILE=/data/tls/peer2-org1-client.key
@@ -300,7 +305,7 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/data/org2-ca-chain.pem
-      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true
+      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=false
       - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/data/org2-ca-chain.pem
       - CORE_PEER_TLS_CLIENTCERT_FILE=/data/tls/peer1-org2-client.crt
       - CORE_PEER_TLS_CLIENTKEY_FILE=/data/tls/peer1-org2-client.key
@@ -345,7 +350,7 @@ services:
       - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.crt
       - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/data/org2-ca-chain.pem
-      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=true
+      - CORE_PEER_TLS_CLIENTAUTHREQUIRED=false
       - CORE_PEER_TLS_CLIENTROOTCAS_FILES=/data/org2-ca-chain.pem
       - CORE_PEER_TLS_CLIENTCERT_FILE=/data/tls/peer2-org2-client.crt
       - CORE_PEER_TLS_CLIENTKEY_FILE=/data/tls/peer2-org2-client.key