From 216d422f112b16d59fcd9b265ff58ffb794ab1ad Mon Sep 17 00:00:00 2001 From: nao Date: Wed, 6 Oct 2021 21:34:04 +0900 Subject: [PATCH] Fix: Cannot launch chaincode in nano bash in Linux (#468) CHAINCODEADDRESS is set to host.docker.internal which is only available in MAC and Windows environments. For that reason, it cannot launch chaincode on Linux. This PR sets CHAINCODEADDRESS to 127.0.0.1 instead of host.docker.internal. Signed-off-by: Nao Nishijima --- test-network-nano-bash/peer1.sh | 8 +++++++- test-network-nano-bash/peer2.sh | 8 +++++++- test-network-nano-bash/peer3.sh | 8 +++++++- test-network-nano-bash/peer4.sh | 8 +++++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/test-network-nano-bash/peer1.sh b/test-network-nano-bash/peer1.sh index 6655936b..89d5d8da 100755 --- a/test-network-nano-bash/peer1.sh +++ b/test-network-nano-bash/peer1.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash set -euo pipefail +if [ "$(uname)" == "Linux" ] ; then + CCADDR="127.0.0.1" +else + CCADDR="host.docker.internal" +fi + # look for binaries in local dev environment /build/bin directory and then in local samples /bin directory export PATH="${PWD}"/../../fabric/build/bin:"${PWD}"/../bin:"$PATH" export FABRIC_CFG_PATH="${PWD}"/../config @@ -13,7 +19,7 @@ export CORE_PEER_TLS_ROOTCERT_FILE="${PWD}"/crypto-config/peerOrganizations/org1 export CORE_PEER_ID=peer0.org1.example.com export CORE_PEER_ADDRESS=127.0.0.1:7051 export CORE_PEER_LISTENADDRESS=127.0.0.1:7051 -export CORE_PEER_CHAINCODEADDRESS=host.docker.internal:7052 +export CORE_PEER_CHAINCODEADDRESS="${CCADDR}":7052 export CORE_PEER_CHAINCODELISTENADDRESS=127.0.0.1:7052 # bootstrap peer is the other peer in the same org export CORE_PEER_GOSSIP_BOOTSTRAP=127.0.0.1:7053 diff --git a/test-network-nano-bash/peer2.sh b/test-network-nano-bash/peer2.sh index 39f66312..163df06e 100755 --- a/test-network-nano-bash/peer2.sh +++ b/test-network-nano-bash/peer2.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash set -euo pipefail +if [ "$(uname)" == "Linux" ] ; then + CCADDR="127.0.0.1" +else + CCADDR="host.docker.internal" +fi + # look for binaries in local dev environment /build/bin directory and then in local samples /bin directory export PATH="${PWD}"/../../fabric/build/bin:"${PWD}"/../bin:"$PATH" export FABRIC_CFG_PATH="${PWD}"/../config @@ -13,7 +19,7 @@ export CORE_PEER_TLS_ROOTCERT_FILE="${PWD}"/crypto-config/peerOrganizations/org1 export CORE_PEER_ID=peer1.org1.example.com export CORE_PEER_ADDRESS=127.0.0.1:7053 export CORE_PEER_LISTENADDRESS=127.0.0.1:7053 -export CORE_PEER_CHAINCODEADDRESS=host.docker.internal:7054 +export CORE_PEER_CHAINCODEADDRESS="${CCADDR}":7054 export CORE_PEER_CHAINCODELISTENADDRESS=127.0.0.1:7054 # bootstrap peer is the other peer in the same org export CORE_PEER_GOSSIP_BOOTSTRAP=127.0.0.1:7051 diff --git a/test-network-nano-bash/peer3.sh b/test-network-nano-bash/peer3.sh index 58abfdf0..1054118f 100755 --- a/test-network-nano-bash/peer3.sh +++ b/test-network-nano-bash/peer3.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash set -euo pipefail +if [ "$(uname)" == "Linux" ] ; then + CCADDR="127.0.0.1" +else + CCADDR="host.docker.internal" +fi + # look for binaries in local dev environment /build/bin directory and then in local samples /bin directory export PATH="${PWD}"/../../fabric/build/bin:"${PWD}"/../bin:"$PATH" export FABRIC_CFG_PATH="${PWD}"/../config @@ -13,7 +19,7 @@ export CORE_PEER_TLS_ROOTCERT_FILE="${PWD}"/crypto-config/peerOrganizations/org2 export CORE_PEER_ID=peer0.org2.example.com export CORE_PEER_ADDRESS=127.0.0.1:7055 export CORE_PEER_LISTENADDRESS=127.0.0.1:7055 -export CORE_PEER_CHAINCODEADDRESS=host.docker.internal:7056 +export CORE_PEER_CHAINCODEADDRESS="${CCADDR}":7056 export CORE_PEER_CHAINCODELISTENADDRESS=127.0.0.1:7056 # bootstrap peer is the other peer in the same org export CORE_PEER_GOSSIP_BOOTSTRAP=127.0.0.1:7057 diff --git a/test-network-nano-bash/peer4.sh b/test-network-nano-bash/peer4.sh index 2923f874..a62afe58 100755 --- a/test-network-nano-bash/peer4.sh +++ b/test-network-nano-bash/peer4.sh @@ -1,6 +1,12 @@ #!/usr/bin/env bash set -euo pipefail +if [ "$(uname)" == "Linux" ] ; then + CCADDR="127.0.0.1" +else + CCADDR="host.docker.internal" +fi + # look for binaries in local dev environment /build/bin directory and then in local samples /bin directory export PATH="${PWD}"/../../fabric/build/bin:"${PWD}"/../bin:"$PATH" export FABRIC_CFG_PATH="${PWD}"/../config @@ -13,7 +19,7 @@ export CORE_PEER_TLS_ROOTCERT_FILE="${PWD}"/crypto-config/peerOrganizations/org2 export CORE_PEER_ID=peer0.org2.example.com export CORE_PEER_ADDRESS=127.0.0.1:7057 export CORE_PEER_LISTENADDRESS=127.0.0.1:7057 -export CORE_PEER_CHAINCODEADDRESS=host.docker.internal:7058 +export CORE_PEER_CHAINCODEADDRESS="${CCADDR}":7058 export CORE_PEER_CHAINCODELISTENADDRESS=127.0.0.1:7058 # bootstrap peer is the other peer in the same org export CORE_PEER_GOSSIP_BOOTSTRAP=127.0.0.1:7055