From 5203474de15a0f192ab2761e46797b8594c75afd Mon Sep 17 00:00:00 2001 From: Baohua Yang Date: Tue, 2 Aug 2016 08:41:16 +0800 Subject: [PATCH] Update with last service port --- hyperledger/noops/docker-compose-1.yml | 8 ++-- .../noops/docker-compose-with-membersrvc.yml | 42 +++++++++---------- hyperledger/noops/docker-compose.yml | 14 +++---- .../pbft/docker-compose-with-membersrvc.yml | 41 +++++++++--------- hyperledger/pbft/docker-compose.yml | 14 +++---- hyperledger/pbft/peer-pbft.yml | 7 ++-- 6 files changed, 61 insertions(+), 65 deletions(-) diff --git a/hyperledger/noops/docker-compose-1.yml b/hyperledger/noops/docker-compose-1.yml index d4879058..ecc1b7f2 100644 --- a/hyperledger/noops/docker-compose-1.yml +++ b/hyperledger/noops/docker-compose-1.yml @@ -7,8 +7,8 @@ # validating node as the root # vp0 will also be used for client interactive operations -# If you want to run fabric command on the host, then map 30303:30303 to host -# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:30303` to specify peer addr. +# If you want to run fabric command on the host, then map 7051:7051 to host +# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:7051` to specify peer addr. vp0: extends: file: peer-noops.yml @@ -17,6 +17,6 @@ vp0: environment: - CORE_PEER_ID=vp0 ports: - - "5000:5000" - #- "30303:30303" + - "7050:7050" + #- "7051:7051" diff --git a/hyperledger/noops/docker-compose-with-membersrvc.yml b/hyperledger/noops/docker-compose-with-membersrvc.yml index 233e5f6d..ab34a1e2 100644 --- a/hyperledger/noops/docker-compose-with-membersrvc.yml +++ b/hyperledger/noops/docker-compose-with-membersrvc.yml @@ -9,15 +9,15 @@ membersrvc: image: yeasy/hyperledger-membersrvc:latest restart: unless-stopped expose: - - "50051" + - "7054" volumes: # docker.sock is mapped as the default CORE_VM_ENDPOINT - /var/run/docker.sock:/var/run/docker.sock command: membersrvc # this repeats the default cmd to make sure # validating node as the root # vp0 will also be used for client interactive operations -# If you want to run fabric command on the host, then map 30303:30303 to host -# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:30303` to specify peer addr. +# If you want to run fabric command on the host, then map 7051:7051 to host +# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:7051` to specify peer addr. vp0: extends: file: peer-noops.yml @@ -28,12 +28,12 @@ vp0: - CORE_SECURITY_ENABLED=true - CORE_SECURITY_ENROLLID=test_vp0 - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 ports: - - "5000:5000" - #- "30303:30303" + - "7050:7050" + #- "7051:7051" links: - membersrvc @@ -45,12 +45,12 @@ vp1: environment: - CORE_PEER_ID=vp1 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp1 - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 @@ -63,12 +63,12 @@ vp2: environment: - CORE_PEER_ID=vp2 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp2 - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 @@ -81,14 +81,12 @@ vp3: environment: - CORE_PEER_ID=vp3 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp3 - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 - - diff --git a/hyperledger/noops/docker-compose.yml b/hyperledger/noops/docker-compose.yml index d5f87304..edc2c2fc 100644 --- a/hyperledger/noops/docker-compose.yml +++ b/hyperledger/noops/docker-compose.yml @@ -7,8 +7,8 @@ # validating node as the root # vp0 will also be used for client interactive operations -# If you want to run fabric command on the host, then map 30303:30303 to host -# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:30303` to specify peer addr. +# If you want to run fabric command on the host, then map 7051:7051 to host +# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:7051` to specify peer addr. vp0: extends: file: peer-noops.yml @@ -17,8 +17,8 @@ vp0: environment: - CORE_PEER_ID=vp0 ports: - - "5000:5000" - #- "30303:30303" + - "7050:7050" + #- "7051:7051" # validating node vp1: @@ -28,7 +28,7 @@ vp1: hostname: vp1 environment: - CORE_PEER_ID=vp1 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 @@ -40,7 +40,7 @@ vp2: hostname: vp2 environment: - CORE_PEER_ID=vp2 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 @@ -53,6 +53,6 @@ vp3: hostname: vp3 environment: - CORE_PEER_ID=vp3 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 diff --git a/hyperledger/pbft/docker-compose-with-membersrvc.yml b/hyperledger/pbft/docker-compose-with-membersrvc.yml index 39532e1b..ab139c65 100644 --- a/hyperledger/pbft/docker-compose-with-membersrvc.yml +++ b/hyperledger/pbft/docker-compose-with-membersrvc.yml @@ -16,12 +16,12 @@ vp0: - CORE_SECURITY_ENABLED=true - CORE_SECURITY_ENROLLID=test_vp0 - CORE_SECURITY_ENROLLSECRET=MwYpmSRjupbT - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 ports: - - "5000:5000" - #- "30303:30303" + - "7050:7050" + #- "7051:7051" links: - membersrvc @@ -33,12 +33,12 @@ vp1: environment: - CORE_PEER_ID=vp1 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp1 - CORE_SECURITY_ENROLLSECRET=5wgHK9qqYaPy - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 @@ -51,20 +51,20 @@ vp2: environment: - CORE_PEER_ID=vp2 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp2 - CORE_SECURITY_ENROLLSECRET=vQelbRvja7cJ - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 # vp3 will be used for client interactive operations -# If you want to run fabric command on the host, then map 30303:30303 to host -# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:30303` to specify peer addr. +# If you want to run fabric command on the host, then map 7051:7051 to host +# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:7051` to specify peer addr. vp3: extends: file: peer-pbft.yml @@ -73,12 +73,12 @@ vp3: environment: - CORE_PEER_ID=vp3 - CORE_SECURITY_ENABLED=true - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 - CORE_SECURITY_ENROLLID=test_vp3 - CORE_SECURITY_ENROLLSECRET=9LKqKH5peurL - - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051 - - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:50051 + - CORE_PEER_PKI_ECA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TCA_PADDR=membersrvc:7054 + - CORE_PEER_PKI_TLSCA_PADDR=membersrvc:7054 links: - membersrvc - vp0 @@ -87,8 +87,7 @@ membersrvc: image: yeasy/hyperledger-membersrvc:latest restart: unless-stopped expose: - - "50051" + - "7054" volumes: # docker.sock is mapped as the default CORE_VM_ENDPOINT - /var/run/docker.sock:/var/run/docker.sock command: membersrvc # this repeats the default cmd to make sure - diff --git a/hyperledger/pbft/docker-compose.yml b/hyperledger/pbft/docker-compose.yml index decfb532..3c080949 100644 --- a/hyperledger/pbft/docker-compose.yml +++ b/hyperledger/pbft/docker-compose.yml @@ -14,8 +14,8 @@ vp0: environment: - CORE_PEER_ID=vp0 ports: - - "5000:5000" - #- "30303:30303" + - "7050:7050" + #- "7051:7051" # validating node vp1: @@ -25,7 +25,7 @@ vp1: hostname: vp1 environment: - CORE_PEER_ID=vp1 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 @@ -37,15 +37,15 @@ vp2: hostname: vp2 environment: - CORE_PEER_ID=vp2 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 # validating node # vp3 will also be used for client interactive operations -# If you want to run fabric command on the host, then map 30303:30303 to host -# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:30303` to specify peer addr. +# If you want to run fabric command on the host, then map 7051:7051 to host +# port, or use like `CORE_PEER_ADDRESS=172.17.0.2:7051` to specify peer addr. vp3: extends: file: peer-pbft.yml @@ -53,6 +53,6 @@ vp3: hostname: vp3 environment: - CORE_PEER_ID=vp3 - - CORE_PEER_DISCOVERY_ROOTNODE=vp0:30303 + - CORE_PEER_DISCOVERY_ROOTNODE=vp0:7051 links: - vp0 diff --git a/hyperledger/pbft/peer-pbft.yml b/hyperledger/pbft/peer-pbft.yml index 0c3f0f29..01ec0c63 100644 --- a/hyperledger/pbft/peer-pbft.yml +++ b/hyperledger/pbft/peer-pbft.yml @@ -21,10 +21,9 @@ vp: - CORE_PBFT_GENERAL_BATCHSIZE=2 # only useful when in batch mode - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=2s expose: - - "30303" - - "30304" - - "31315" + - "7051" + - "7052" + - "7053" volumes: # docker.sock is mapped as the default CORE_VM_ENDPOINT - /var/run/docker.sock:/var/run/docker.sock command: peer node start # this repeats the default cmd to make sure -