From e7d7e1f2d2c7325b26b768b233b19a36b85f7cee Mon Sep 17 00:00:00 2001 From: wuqiaomin Date: Mon, 19 Apr 2021 15:11:15 +0800 Subject: [PATCH] specify image version and CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE Signed-off-by: wuqiaomin --- interest_rate_swaps/network/docker-compose.yaml | 6 +++--- .../addOrg3/docker/docker-compose-ca-org3.yaml | 2 +- test-network/addOrg3/docker/docker-compose-org3.yaml | 4 ++-- test-network/docker/docker-compose-ca.yaml | 6 +++--- test-network/docker/docker-compose-test-net.yaml | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/interest_rate_swaps/network/docker-compose.yaml b/interest_rate_swaps/network/docker-compose.yaml index 21dc5df2..d6c55a18 100644 --- a/interest_rate_swaps/network/docker-compose.yaml +++ b/interest_rate_swaps/network/docker-compose.yaml @@ -15,7 +15,7 @@ volumes: services: peer-base: - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:2.2.2 environment: - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - FABRIC_LOGGING_SPEC=INFO @@ -29,7 +29,7 @@ services: orderer: container_name: irs-orderer - image: hyperledger/fabric-orderer:$IMAGE_TAG + image: hyperledger/fabric-orderer:2.2.2 environment: - FABRIC_LOGGING_SPEC=INFO - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 @@ -132,7 +132,7 @@ services: cli: container_name: cli - image: hyperledger/fabric-tools:$IMAGE_TAG + image: hyperledger/fabric-tools:2.2.2 tty: true stdin_open: true environment: diff --git a/test-network/addOrg3/docker/docker-compose-ca-org3.yaml b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml index 46822e84..04a72276 100644 --- a/test-network/addOrg3/docker/docker-compose-ca-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-ca-org3.yaml @@ -8,7 +8,7 @@ version: '2' services: ca_org3: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:2.2.2 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-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 9727e99a..6a19c265 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -15,14 +15,14 @@ services: peer0.org3.example.com: container_name: peer0.org3.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:2.2.2 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 15d0ea0d..13d5b60f 100644 --- a/test-network/docker/docker-compose-ca.yaml +++ b/test-network/docker/docker-compose-ca.yaml @@ -11,7 +11,7 @@ networks: services: ca_org1: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:2.2.2 environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org1 @@ -27,7 +27,7 @@ services: - test ca_org2: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:2.2.2 environment: - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - FABRIC_CA_SERVER_CA_NAME=ca-org2 @@ -43,7 +43,7 @@ services: - test ca_orderer: - image: hyperledger/fabric-ca:$IMAGE_TAG + image: hyperledger/fabric-ca:2.2.2 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 71acf7fa..e1134d81 100644 --- a/test-network/docker/docker-compose-test-net.yaml +++ b/test-network/docker/docker-compose-test-net.yaml @@ -17,7 +17,7 @@ services: orderer.example.com: container_name: orderer.example.com - image: hyperledger/fabric-orderer:$IMAGE_TAG + image: hyperledger/fabric-orderer:2.2.2 environment: - FABRIC_LOGGING_SPEC=INFO - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 @@ -50,14 +50,14 @@ services: peer0.org1.example.com: container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:2.2.2 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 @@ -88,14 +88,14 @@ services: peer0.org2.example.com: container_name: peer0.org2.example.com - image: hyperledger/fabric-peer:$IMAGE_TAG + image: hyperledger/fabric-peer:2.2.2 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 @@ -126,7 +126,7 @@ services: cli: container_name: cli - image: hyperledger/fabric-tools:$IMAGE_TAG + image: hyperledger/fabric-tools:2.2.2 tty: true stdin_open: true environment: