diff --git a/varion/compose/compose-couch.yaml b/varion/compose/compose-couch.yaml index 4a88f45a..1ef99af4 100644 --- a/varion/compose/compose-couch.yaml +++ b/varion/compose/compose-couch.yaml @@ -21,13 +21,13 @@ services: - COUCHDB_USER=admin - COUCHDB_PASSWORD=adminpw # 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. + # for varion map it to utilize Fauxton User Interface in dev environments. ports: - "5984:5984" networks: - test - peer0.org1.example.com: + peer0.farmer.varion.com: environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb0:5984 @@ -50,13 +50,13 @@ services: - COUCHDB_USER=admin - COUCHDB_PASSWORD=adminpw # 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. + # for varion map it to utilize Fauxton User Interface in dev environments. ports: - "7984:5984" networks: - test - peer0.org2.example.com: + peer0.pulper.varion.com: environment: - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb1:5984 @@ -67,3 +67,61 @@ services: - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw depends_on: - couchdb1 + + couchdb2: + container_name: couchdb2 + image: couchdb:3.3.3 + labels: + service: hyperledger-fabric + # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password + # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. + environment: + - COUCHDB_USER=admin + - COUCHDB_PASSWORD=adminpw + # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service, + # for varion map it to utilize Fauxton User Interface in dev environments. + ports: + - "9984:5984" + networks: + - test + + peer0.huller.varion.com: + environment: + - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb2:5984 + # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD + # provide the credentials for ledger to connect to CouchDB. The username and password must + # match the username and password set for the associated CouchDB. + - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin + - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw + depends_on: + - couchdb1 + + couchdb3: + container_name: couchdb3 + image: couchdb:3.3.3 + labels: + service: hyperledger-fabric + # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password + # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. + environment: + - COUCHDB_USER=admin + - COUCHDB_PASSWORD=adminpw + # Comment/Uncomment the port mapping if you want to hide/expose the CouchDB service, + # for varion map it to utilize Fauxton User Interface in dev environments. + ports: + - "11984:5984" + networks: + - test + + peer0.export.varion.com: + environment: + - CORE_LEDGER_STATE_STATEDATABASE=CouchDB + - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb2:5984 + # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD + # provide the credentials for ledger to connect to CouchDB. The username and password must + # match the username and password set for the associated CouchDB. + - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin + - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw + depends_on: + - couchdb3 diff --git a/varion/compose/compose-test-net.yaml b/varion/compose/compose-test-net.yaml index 2754f40b..e111009d 100644 --- a/varion/compose/compose-test-net.yaml +++ b/varion/compose/compose-test-net.yaml @@ -82,7 +82,7 @@ services: - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:7052 - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.farmer.varion.com:7051 - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.farmer.varion.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP + - CORE_PEER_LOCALMSPID=FarmerMSP - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp - CORE_OPERATIONS_LISTENADDRESS=peer0.farmer.varion.com:9444 - CORE_METRICS_PROVIDER=prometheus @@ -121,7 +121,7 @@ services: - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:9052 - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.pulper.varion.com:9051 - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.pulper.varion.com:9051 - - CORE_PEER_LOCALMSPID=Org2MSP + - CORE_PEER_LOCALMSPID=PulperMSP - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp - CORE_OPERATIONS_LISTENADDRESS=peer0.pulper.varion.com:9445 - CORE_METRICS_PROVIDER=prometheus @@ -154,15 +154,15 @@ services: - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt # Peer specific variables - CORE_PEER_ID=peer0.huller.varion.com - - CORE_PEER_ADDRESS=peer0.huller.varion.com:9051 - - CORE_PEER_LISTENADDRESS=0.0.0.0:9051 - - CORE_PEER_CHAINCODEADDRESS=peer0.huller.varion.com:9052 - - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:9052 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.huller.varion.com:9051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.huller.varion.com:9051 - - CORE_PEER_LOCALMSPID=Org2MSP + - CORE_PEER_ADDRESS=peer0.huller.varion.com:11051 + - CORE_PEER_LISTENADDRESS=0.0.0.0:11051 + - CORE_PEER_CHAINCODEADDRESS=peer0.huller.varion.com:11052 + - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:11052 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.huller.varion.com:11051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.huller.varion.com:11051 + - CORE_PEER_LOCALMSPID=HullerMSP - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp - - CORE_OPERATIONS_LISTENADDRESS=peer0.huller.varion.com:9445 + - CORE_OPERATIONS_LISTENADDRESS=peer0.huller.varion.com:11446 - CORE_METRICS_PROVIDER=prometheus - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={"peername":"peer0huller"} - CORE_CHAINCODE_EXECUTETIMEOUT=300s @@ -172,8 +172,8 @@ services: working_dir: /root command: peer node start ports: - - 9051:9051 - - 9445:9445 + - 11051:11051 + - 11446:11446 networks: - test @@ -193,15 +193,15 @@ services: - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt # Peer specific variables - CORE_PEER_ID=peer0.export.varion.com - - CORE_PEER_ADDRESS=peer0.export.varion.com:9051 - - CORE_PEER_LISTENADDRESS=0.0.0.0:9051 - - CORE_PEER_CHAINCODEADDRESS=peer0.export.varion.com:9052 - - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:9052 - - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.export.varion.com:9051 - - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.export.varion.com:9051 - - CORE_PEER_LOCALMSPID=Org2MSP + - CORE_PEER_ADDRESS=peer0.export.varion.com:12051 + - CORE_PEER_LISTENADDRESS=0.0.0.0:12051 + - CORE_PEER_CHAINCODEADDRESS=peer0.export.varion.com:12052 + - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:12052 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.export.varion.com:12051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.export.varion.com:12051 + - CORE_PEER_LOCALMSPID=ExportMSP - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp - - CORE_OPERATIONS_LISTENADDRESS=peer0.export.varion.com:9445 + - CORE_OPERATIONS_LISTENADDRESS=peer0.export.varion.com:12447 - CORE_METRICS_PROVIDER=prometheus - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={"peername":"peer0export"} - CORE_CHAINCODE_EXECUTETIMEOUT=300s @@ -211,7 +211,7 @@ services: working_dir: /root command: peer node start ports: - - 9051:9051 - - 9445:9445 + - 12051:12051 + - 12447:12447 networks: - test diff --git a/varion/organizations/ccp-template.json b/varion/organizations/ccp-template.json index 0a8274b4..f639bf59 100755 --- a/varion/organizations/ccp-template.json +++ b/varion/organizations/ccp-template.json @@ -2,7 +2,7 @@ "name": "test-network-${ORG}", "version": "1.0.0", "client": { - "organization": "Org${ORG}", + "organization": "${ORG}", "connection": { "timeout": { "peer": { @@ -12,8 +12,8 @@ } }, "organizations": { - "Org${ORG}": { - "mspid": "Org${ORG}MSP", + "${ORG}": { + "mspid": "${ORG}MSP", "peers": [ "peer0.${ORG}.varion.com" ],