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) (#1140)

Browse source 
* add support for docker compose v2 (fix #730)

Signed-off-by: uniform64 <jiny2048@gmail.com>

* add support for docker compose v2 (fix #730)
some missing places in the previous commit

Signed-off-by: uniform64 <jiny2048@gmail.com>

---------

Signed-off-by: uniform64 <jiny2048@gmail.com>
This commit is contained in:
uniform64 2023-12-11 15:13:25 +08:00 committed by GitHub
parent 07e7ee4ab6
commit cdb126d061
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,11 @@ export VERBOSE=false
. ../scripts/utils.sh . ../scripts/utils.sh
: ${CONTAINER_CLI:="docker"} : ${CONTAINER_CLI:="docker"}
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"} if command -v docker-compose > /dev/null 2>&1; then
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
else
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
fi
infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}" infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}"

6
test-network/network.sh
View file

@ -29,7 +29,11 @@ trap "popd > /dev/null" EXIT
. scripts/utils.sh . scripts/utils.sh
: ${CONTAINER_CLI:="docker"} : ${CONTAINER_CLI:="docker"}
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"} if command -v docker-compose > /dev/null 2>&1; then
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
else
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
fi
infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}" infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}"
# Obtain CONTAINER_IDS and remove them # Obtain CONTAINER_IDS and remove them

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

@ -17,7 +17,11 @@ BFT="$5"
: ${BFT:=0} : ${BFT:=0}
: ${CONTAINER_CLI:="docker"} : ${CONTAINER_CLI:="docker"}
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"} if command -v docker-compose > /dev/null 2>&1; then
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
else
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
fi
infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}" infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}"
if [ ! -d "channel-artifacts" ]; then if [ ! -d "channel-artifacts" ]; then

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

@ -24,7 +24,11 @@ VERBOSE=${12:-"false"}
CCAAS_SERVER_PORT=9999 CCAAS_SERVER_PORT=9999
: ${CONTAINER_CLI:="docker"} : ${CONTAINER_CLI:="docker"}
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"} if command -v docker-compose > /dev/null 2>&1; then
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI}-compose"}
else
: ${CONTAINER_CLI_COMPOSE:="${CONTAINER_CLI} compose"}
fi
infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}" infoln "Using ${CONTAINER_CLI} and ${CONTAINER_CLI_COMPOSE}"
println "executing with the following" println "executing with the following"