add support for docker compose v2 (fix #730)

fix bugs in #1140 Signed-off-by: uniform64 <jiny2048@gmail.com>
hyperledger · Dec 12, 2023 · 02d9f8c · 02d9f8c
1 parent cdb126d
commit 02d9f8c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"}