From 7b5ae169e721f93307d9bf7fe3949f22d170aaa0 Mon Sep 17 00:00:00 2001
From: Kurt Seifried <kurt@seifried.org>
Date: Tue, 16 Mar 2021 20:40:27 -0600
Subject: [PATCH] Corrected 5-6 typo and ports

---
 .../docker/docker-compose-ca-org5.yaml        | 12 ++++----
 .../docker/docker-compose-couch-org5.yaml     |  4 +--
 .../addOrg5/docker/docker-compose-org5.yaml   | 30 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test-network/addOrg5/docker/docker-compose-ca-org5.yaml b/test-network/addOrg5/docker/docker-compose-ca-org5.yaml
index 6fe12528..e07622a5 100644
--- a/test-network/addOrg5/docker/docker-compose-ca-org5.yaml
+++ b/test-network/addOrg5/docker/docker-compose-ca-org5.yaml
@@ -10,18 +10,18 @@ networks:
     name: fabric_test
 
 services:
-  ca_org6:
+  ca_org5:
     image: hyperledger/fabric-ca:latest
     labels:
       service: hyperledger-fabric
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
-      - FABRIC_CA_SERVER_CA_NAME=ca-org6
+      - FABRIC_CA_SERVER_CA_NAME=ca-org5
       - FABRIC_CA_SERVER_TLS_ENABLED=true
-      - FABRIC_CA_SERVER_PORT=11054
+      - FABRIC_CA_SERVER_PORT=15054
     ports:
-      - "11054:11054"
+      - "15054:15054"
     command: sh -c 'fabric-ca-server start -b admin:adminpw -d'
     volumes:
-      - ../fabric-ca/org6:/etc/hyperledger/fabric-ca-server
-    container_name: ca_org6
+      - ../fabric-ca/org5:/etc/hyperledger/fabric-ca-server
+    container_name: ca_org5
diff --git a/test-network/addOrg5/docker/docker-compose-couch-org5.yaml b/test-network/addOrg5/docker/docker-compose-couch-org5.yaml
index 4c8a5a0a..92944a2d 100644
--- a/test-network/addOrg5/docker/docker-compose-couch-org5.yaml
+++ b/test-network/addOrg5/docker/docker-compose-couch-org5.yaml
@@ -23,11 +23,11 @@ services:
     # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service,
     # for example map it to utilize Fauxton User Interface in dev environments.
     ports:
-      - "9984:5984"
+      - "13084:5984"
     networks:
       - test
 
-  peer0.org6.example.com:
+  peer0.org5.example.com:
     environment:
       - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
       - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb4:5984
diff --git a/test-network/addOrg5/docker/docker-compose-org5.yaml b/test-network/addOrg5/docker/docker-compose-org5.yaml
index b7a1ee44..3ae1d89c 100644
--- a/test-network/addOrg5/docker/docker-compose-org5.yaml
+++ b/test-network/addOrg5/docker/docker-compose-org5.yaml
@@ -6,7 +6,7 @@
 version: '2'
 
 volumes:
-  peer0.org6.example.com:
+  peer0.org5.example.com:
 
 networks:
   test:
@@ -14,8 +14,8 @@ networks:
 
 services:
 
-  peer0.org6.example.com:
-    container_name: peer0.org6.example.com
+  peer0.org5.example.com:
+    container_name: peer0.org5.example.com
     image: hyperledger/fabric-peer:latest
     labels:
       service: hyperledger-fabric
@@ -31,22 +31,22 @@ services:
       - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
       - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
       # Peer specific variabes
-      - CORE_PEER_ID=peer0.org6.example.com
-      - CORE_PEER_ADDRESS=peer0.org6.example.com:11051
-      - CORE_PEER_LISTENADDRESS=0.0.0.0:11051
-      - CORE_PEER_CHAINCODEADDRESS=peer0.org6.example.com:11052
-      - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:11052
-      - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org6.example.com:11051
-      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org6.example.com:11051
-      - CORE_PEER_LOCALMSPID=Org6MSP
+      - CORE_PEER_ID=peer0.org5.example.com
+      - CORE_PEER_ADDRESS=peer0.org5.example.com:15051
+      - CORE_PEER_LISTENADDRESS=0.0.0.0:15051
+      - CORE_PEER_CHAINCODEADDRESS=peer0.org5.example.com:15052
+      - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:15052
+      - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org5.example.com:15051
+      - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org5.example.com:15051
+      - CORE_PEER_LOCALMSPID=Org5MSP
     volumes:
         - /var/run/docker.sock:/host/var/run/docker.sock
-        - ../../organizations/peerOrganizations/org6.example.com/peers/peer0.org6.example.com/msp:/etc/hyperledger/fabric/msp
-        - ../../organizations/peerOrganizations/org6.example.com/peers/peer0.org6.example.com/tls:/etc/hyperledger/fabric/tls
-        - peer0.org6.example.com:/var/hyperledger/production
+        - ../../organizations/peerOrganizations/org5.example.com/peers/peer0.org5.example.com/msp:/etc/hyperledger/fabric/msp
+        - ../../organizations/peerOrganizations/org5.example.com/peers/peer0.org5.example.com/tls:/etc/hyperledger/fabric/tls
+        - peer0.org5.example.com:/var/hyperledger/production
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: peer node start
     ports:
-      - 11051:11051
+      - 15051:15051
     networks:
       - test