epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 15:35:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for docker compose v2 (fix #730)

Browse source 
fix bugs in #1140

Signed-off-by: uniform64 <jiny2048@gmail.com>
This commit is contained in:
uniform64 2023-12-12 11:38:18 +08:00 committed by Dave Enyeart
parent cdb126d061
commit 02d9f8c58b
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test-network/addOrg3/addOrg3.sh
View file

@ -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"}

2
test-network/network.sh
View file

@ -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"}

2
test-network/scripts/createChannel.sh
View file

@ -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"}

2
test-network/scripts/deployCCAAS.sh
View file

@ -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"}