Merge pull request #1422 from bcbrock/issue1263

Change unofficial Docker port 4243 to 2375

bddtests/compose-defaults.yml

@@ -2,7 +2,7 @@ vp:
   image: hyperledger-peer
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
-    - CORE_VM_ENDPOINT=http://172.17.0.1:4243
+    - CORE_VM_ENDPOINT=http://172.17.0.1:2375
     # TODO:  This is currently required due to BUG in variant logic based upon log level.
     - CORE_LOGGING_LEVEL=DEBUG
   # Startup of peer must be delayed to allow membersrvc to come up first
@@ -11,5 +11,5 @@ vp:
 membersrvc:
    image: membersrvc
    environment:
-    - CORE_VM_ENDPOINT=http://172.17.0.1:4243
+    - CORE_VM_ENDPOINT=http://172.17.0.1:2375
    command: membersrvc

consensus/docker-compose-files/compose-consensus-4-defaults.yml

@@ -6,7 +6,7 @@ vp:
     - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft
     - CORE_PBFT_GENERAL_N=4
     - CORE_PBFT_GENERAL_TIMEOUT_REQUEST=10s
-    - CORE_VM_ENDPOINT=http://172.17.0.1:4243
+    - CORE_VM_ENDPOINT=http://172.17.0.1:2375
     - CORE_SECURITY_ENABLED=true
     - CORE_PEER_PKI_ECA_PADDR=membersrvc:50051
     - CORE_PEER_PKI_TCA_PADDR=membersrvc:50051

consensus/docker-compose-files/compose-consensus-4.yml

@@ -1,14 +1,14 @@
 membersrvc:
    image: membersrvc
    environment:
-    - CORE_VM_ENDPOINT=http://172.17.0.1:4243
+    - CORE_VM_ENDPOINT=http://172.17.0.1:2375
    command: membersrvc
 
 cli:
   image: hyperledger-peer
   command: ../scripts/infiniteloop.sh
   environment:
-    - CORE_VM_ENDPOINT=http://172.17.0.1:4243
+    - CORE_VM_ENDPOINT=http://172.17.0.1:2375
     - CORE_PEER_ADDRESSAUTODETECT=true
     - CORE_SECURITY_ENABLED=true
 

core/ledger/genesis/genesis_test.yaml

@@ -166,7 +166,7 @@ vm:
 
     # Endpoint of the vm management system.  For docker can be one of the following in general
     # unix:///var/run/docker.sock
-    # http://localhost:4243
+    # http://localhost:2375
     endpoint: unix:///var/run/docker.sock
 
 

devenv/setup.sh

@@ -70,7 +70,7 @@ esac
 apt-get install -y linux-image-extra-$(uname -r) apparmor docker-engine
 
 # Configure docker
-echo "DOCKER_OPTS=\"-s=${DOCKER_STORAGE_BACKEND_STRING} -r=true --api-cors-header='*' -H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock ${DOCKER_OPTS}\"" > /etc/default/docker
+echo "DOCKER_OPTS=\"-s=${DOCKER_STORAGE_BACKEND_STRING} -r=true --api-cors-header='*' -H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock ${DOCKER_OPTS}\"" > /etc/default/docker
 
 curl -L https://github.com/docker/compose/releases/download/1.5.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose

docs/dev-setup/devnet-setup.md

@@ -47,13 +47,13 @@ By default, we are using a consensus plugin called `NOOPS`, which doesn't really
 #### Start up the first validating peer:
 
 ```
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true hyperledger-peer peer peer
 ```
 
 If started with security, enviroment variables regarding security enabling, CA address and peer's ID and password have to be changed:
 
 ```
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_SECURITY_ENABLED=true -e CORE_SECURITY_PRIVACY=true -e CORE_PEER_PKI_ECA_PADDR=172.17.0.1:50051 -e CORE_PEER_PKI_TCA_PADDR=172.17.0.1:50051 -e CORE_PEER_PKI_TLSCA_PADDR=172.17.0.1:50051 -e CORE_SECURITY_ENROLLID=vp0 -e CORE_SECURITY_ENROLLSECRET=XX  hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_SECURITY_ENABLED=true -e CORE_SECURITY_PRIVACY=true -e CORE_PEER_PKI_ECA_PADDR=172.17.0.1:50051 -e CORE_PEER_PKI_TCA_PADDR=172.17.0.1:50051 -e CORE_PEER_PKI_TLSCA_PADDR=172.17.0.1:50051 -e CORE_SECURITY_ENROLLID=vp0 -e CORE_SECURITY_ENROLLSECRET=XX  hyperledger-peer peer peer
 ```
 
 Additionally, validating peer (enrollID vp0 and enrollSecret XX) has to be added to membersrvc.yaml file (in fabric/membersrvc).
@@ -62,7 +62,7 @@ Additionally, validating peer (enrollID vp0 and enrollSecret XX) has to be added
 We need to get the IP address of the first validating peer, which will act as the root node that the new peer will connect to. The address is printed out on the terminal window of the first peer (eg 172.17.0.2). We'll use "vp2" as the ID for the second validating peer.
 
 ```
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp1 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp1 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 hyperledger-peer peer peer
 ```
 
 You can start up a few more validating peers in the similar manner as you wish. Remember to change the ID.

docs/dev-setup/install.md

@@ -122,7 +122,7 @@ make
 ```
 - Make sure that the Docker daemon initialization includes the options
 ```
--H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock
+-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock
 ```
 - Be aware that the Docker bridge (the `CORE_VM_ENDPOINT`) may not come
 up at the IP address currently assumed by the test environment

examples/chaincode/go/asset_management_with_roles/asset.yaml

@@ -325,8 +325,8 @@ vm:
 
     # Endpoint of the vm management system.  For docker can be one of the following in general
     # unix:///var/run/docker.sock
-    # http://localhost:4243
-    # tcp://localhost:2376
+    # http://localhost:2375
+    # https://localhost:2376
     endpoint: unix:///var/run/docker.sock
 
     # settings for docker vms
@@ -471,4 +471,4 @@ security:
         # The size of the batch of TCerts
         size:  2
       attributes:
-        role: assigner
+        role: assigner

examples/events/block-listener/README.md

@@ -9,13 +9,13 @@ block-listener.go will connect to a peer and recieve blocks. For every transacti
 # Example with PBFT
 
 ## Run 4 docker peers with PBFT
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp0 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
 
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp1 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp1 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
 
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp2 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp2 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
 
-docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:4243 -e CORE_PEER_ID=vp3 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
+docker run --rm -it -e CORE_VM_ENDPOINT=http://172.17.0.1:2375 -e CORE_PEER_ID=vp3 -e CORE_PEER_ADDRESSAUTODETECT=true -e CORE_PEER_DISCOVERY_ROOTNODE=172.17.0.2:30303 -e CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft hyperledger-peer peer peer
 
 ## Attach event client to a Peer
 ./block-listener -event-address=172.17.0.2:31315

membersrvc/ca/ca_test.yaml

@@ -219,7 +219,7 @@ vm:
 
     # Endpoint of the vm management system.  For docker can be one of the following in general
     # unix:///var/run/docker.sock
-    # http://localhost:4243
+    # http://localhost:2375
     endpoint: unix:///var/run/docker.sock
 
 

peer/core.yaml

@@ -252,8 +252,8 @@ vm:
 
     # Endpoint of the vm management system.  For docker can be one of the following in general
     # unix:///var/run/docker.sock
-    # http://localhost:4243
-    # tcp://localhost:2376
+    # http://localhost:2375
+    # https://localhost:2376
     endpoint: unix:///var/run/docker.sock
 
     # settings for docker vms