From 1f68759a6f6193717c69250af8d1c6438cb577ef Mon Sep 17 00:00:00 2001
From: uniform64 <jiny2048@gmail.com>
Date: Tue, 12 Dec 2023 11:38:18 +0800
Subject: [PATCH] add support for docker compose v2 (fix #730) fix bugs in
 #1140

Signed-off-by: uniform64 <jiny2048@gmail.com>
---
 test-network/addOrg3/addOrg3.sh       | 2 +-
 test-network/network.sh               | 2 +-
 test-network/scripts/createChannel.sh | 2 +-
 test-network/scripts/deployCCAAS.sh   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-network/addOrg3/addOrg3.sh b/test-network/addOrg3/addOrg3.sh
index 6d0bf7e5d0..f1beba84bd 100755
--- a/test-network/addOrg3/addOrg3.sh
+++ b/test-network/addOrg3/addOrg3.sh
@@ -18,7 +18,7 @@ export VERBOSE=false
 . ../scripts/utils.sh
 
 : ${CONTAINER_CLI:="docker"}
-if command -v docker-compose > /dev/null 2>&1; then
+if command -v ${CONTAINER_CLI}-compose > /dev/null 2>&1; then
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
 else
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
diff --git a/test-network/network.sh b/test-network/network.sh
index 397221ca16..9739a68b18 100755
--- a/test-network/network.sh
+++ b/test-network/network.sh
@@ -29,7 +29,7 @@ trap "popd > /dev/null" EXIT
 . scripts/utils.sh
 
 : ${CONTAINER_CLI:="docker"}
-if command -v docker-compose > /dev/null 2>&1; then
+if command -v ${CONTAINER_CLI}-compose > /dev/null 2>&1; then
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
 else
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
diff --git a/test-network/scripts/createChannel.sh b/test-network/scripts/createChannel.sh
index 6b19281469..6ff5ae04a9 100755
--- a/test-network/scripts/createChannel.sh
+++ b/test-network/scripts/createChannel.sh
@@ -17,7 +17,7 @@ BFT="$5"
 : ${BFT:=0}
 
 : ${CONTAINER_CLI:="docker"}
-if command -v docker-compose > /dev/null 2>&1; then
+if command -v ${CONTAINER_CLI}-compose > /dev/null 2>&1; then
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
 else
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
diff --git a/test-network/scripts/deployCCAAS.sh b/test-network/scripts/deployCCAAS.sh
index 217dd9c4d8..bc36d589ee 100755
--- a/test-network/scripts/deployCCAAS.sh
+++ b/test-network/scripts/deployCCAAS.sh
@@ -24,7 +24,7 @@ VERBOSE=${12:-"false"}
 CCAAS_SERVER_PORT=9999
 
 : ${CONTAINER_CLI:="docker"}
-if command -v docker-compose > /dev/null 2>&1; then
+if command -v ${CONTAINER_CLI}-compose > /dev/null 2>&1; then
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
 else
     : ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}