From e496083c0b781e8ee085f13a6841db72596901d8 Mon Sep 17 00:00:00 2001 From: denyeart Date: Mon, 30 Aug 2021 11:59:19 -0400 Subject: [PATCH] Remove .env Files and Explicitly Name Network (#417) (#469) There have been lots of changes and quirks with the docker-compose .env file, this change removes the file and explicitly creates and assigns the networks in the compose yaml files. Signed-off-by: Brett Logan Signed-off-by: David Enyeart Co-authored-by: Brett Logan --- test-network/.env | 3 --- test-network/addOrg3/.env | 2 -- .../addOrg3/docker/docker-compose-ca-org3.yaml | 6 +++++- .../addOrg3/docker/docker-compose-couch-org3.yaml | 1 + .../addOrg3/docker/docker-compose-org3.yaml | 8 +++----- test-network/docker/docker-compose-ca.yaml | 6 +++--- test-network/docker/docker-compose-test-net.yaml | 14 ++++---------- 7 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 test-network/.env delete mode 100644 test-network/addOrg3/.env diff --git a/test-network/.env b/test-network/.env deleted file mode 100644 index eba89f91..00000000 --- a/test-network/.env +++ /dev/null @@ -1,3 +0,0 @@ -COMPOSE_PROJECT_NAME=net -IMAGE_TAG=latest -SYS_CHANNEL=system-channel diff --git a/test-network/addOrg3/.env b/test-network/addOrg3/.env deleted file mode 100644 index a6665fed..00000000 --- a/test-network/addOrg3/.env +++ /dev/null @@ -1,2 +0,0 @@ -COMPOSE_PROJECT_NAME=net -IMAGE_TAG=latest diff --git a/test-network/addOrg3/docker/docker-compose-ca-org3.yaml b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml index 46822e84..898a19b1 100644 --- a/test-network/addOrg3/docker/docker-compose-ca-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml @@ -5,10 +5,14 @@ version: '2' +networks: + test: + name: fabric_test + services: ca_org3: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:latest environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org3 diff --git a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml index 8c08a24e..b91296c5 100644 --- a/test-network/addOrg3/docker/docker-compose-couch-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-couch-org3.yaml @@ -7,6 +7,7 @@ version: '2' networks: test: + name: fabric_test services: couchdb4: diff --git a/test-network/addOrg3/docker/docker-compose-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 9727e99a..dfa32e10 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -10,19 +10,17 @@ volumes: networks: test: + name: fabric_test services: peer0.org3.example.com: container_name: peer0.org3.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:latest environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - # the following setting starts chaincode containers on the same - # bridge network as the peers - # https://docs.docker.com/compose/networking/ - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${COMPOSE_PROJECT_NAME}_test + - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=fabric_test - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG - CORE_PEER_TLS_ENABLED=true diff --git a/test-network/docker/docker-compose-ca.yaml b/test-network/docker/docker-compose-ca.yaml index 1827839f..5befe180 100644 --- a/test-network/docker/docker-compose-ca.yaml +++ b/test-network/docker/docker-compose-ca.yaml @@ -12,7 +12,7 @@ networks: services: ca_org1: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:latest environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org1 @@ -30,7 +30,7 @@ services: - test ca_org2: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:latest environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org2 @@ -48,7 +48,7 @@ services: - test ca_orderer: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:latest environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-orderer diff --git a/test-network/docker/docker-compose-test-net.yaml b/test-network/docker/docker-compose-test-net.yaml index de45763d..4c6d71f0 100644 --- a/test-network/docker/docker-compose-test-net.yaml +++ b/test-network/docker/docker-compose-test-net.yaml @@ -18,7 +18,7 @@ services: orderer.example.com: container_name: orderer.example.com - image: hyperledger/fabric-orderer:$IMAGE_TAG + image: hyperledger/fabric-orderer:latest environment: - FABRIC_LOGGING_SPEC=INFO - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 @@ -53,13 +53,10 @@ services: peer0.org1.example.com: container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:latest environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - # the following setting starts chaincode containers on the same - # bridge network as the peers - # https://docs.docker.com/compose/networking/ - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=fabric_test - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG @@ -93,13 +90,10 @@ services: peer0.org2.example.com: container_name: peer0.org2.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:latest environment: #Generic peer variables - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - # the following setting starts chaincode containers on the same - # bridge network as the peers - # https://docs.docker.com/compose/networking/ - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=fabric_test - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG @@ -133,7 +127,7 @@ services: cli: container_name: cli - image: hyperledger/fabric-tools:$IMAGE_TAG + image: hyperledger/fabric-tools:latest tty: true stdin_open: true environment: