FABJ-419 Docker cleanup

Change-Id: I6b299479349eae20f83785b828dab217bdb06402
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

src/test/fixture/sdkintegration/docker-compose.yaml

@@ -84,7 +84,6 @@ services:
       - CORE_PEER_ID=peer0.org1.example.com
       - CORE_PEER_ADDRESS=peer0.org1.example.com:7051
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org1.example.com:7051
-      - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:7051
  #     - CORE_PEER_GOSSIP_ORGLEADER=true
       - CORE_PEER_LOCALMSPID=Org1MSP
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051
@@ -109,7 +108,6 @@ services:
       - CORE_PEER_ADDRESS=peer1.org1.example.com:7056
       - CORE_PEER_LISTENADDRESS=peer1.org1.example.com:7056
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org1.example.com:7056
-      - CORE_PEER_GOSSIP_ENDPOINT=peer1.org1.example.com:7056
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org1.example.com:7051
       - CORE_PEER_LOCALMSPID=Org1MSP
 #      - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/msp/cacerts/ca.org1.example.com-cert.pem
@@ -133,8 +131,7 @@ services:
       - CORE_PEER_ADDRESS=peer0.org2.example.com:8051
       - CORE_PEER_LISTENADDRESS=peer0.org2.example.com:8051
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org2.example.com:8051
-      - CORE_PEER_GOSSIP_ENDPOINT=peer0.org2.example.com:8051
- #     - CORE_PEER_GOSSIP_ORGLEADER=true
+      #     - CORE_PEER_GOSSIP_ORGLEADER=true
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:8051
       - CORE_PEER_LOCALMSPID=Org2MSP
 #      - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/msp/cacerts/ca.org2.example.com-cert.pem
@@ -157,7 +154,6 @@ services:
       - CORE_PEER_ADDRESS=peer1.org2.example.com:8056
       - CORE_PEER_LISTENADDRESS=peer1.org2.example.com:8056
       - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org2.example.com:8056
-      - CORE_PEER_GOSSIP_ENDPOINT=peer0.org1.example.com:8056
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org2.example.com:8051
       - CORE_PEER_LOCALMSPID=Org2MSP
 #      - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/msp/peer/msp/cacerts/ca.org2.example.com-cert.pem

src/test/fixture/sdkintegration/peer-base/peer-base.yaml

@@ -18,7 +18,6 @@ services:
       # The following setting skips the gossip handshake since we are
       # are not doing mutual TLS
       - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/msp
-#      - CORE_PEER_GOSSIP_SKIPHANDSHAKE=true
       - CORE_PEER_PROFILE_ENABLED=false
       - CORE_PEER_TLS_ENABLED=${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_TLS}
       - CORE_PEER_TLS_CLIENTAUTHREQUIRED=${ORG_HYPERLEDGER_FABRIC_SDKTEST_INTEGRATIONTESTS_CLIENT_AUTH_REQUIRED}