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

fix(test-network): ignore the error output when killing CCAAS containers (#1063)

Browse source 
Signed-off-by: Tony Wu <tonywu3027@me.com>
This commit is contained in:
Zhaoxuan "Tony" Wu 2023-07-04 05:01:30 +01:00 committed by GitHub
parent 7671bdd7c6
commit c04253d554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test-network/network.sh
View file

@ -38,6 +38,7 @@ function clearContainers() {
infoln "Removing remaining containers" infoln "Removing remaining containers"
${CONTAINER_CLI} rm -f $(${CONTAINER_CLI} ps -aq --filter label=service=hyperledger-fabric) 2>/dev/null || true ${CONTAINER_CLI} rm -f $(${CONTAINER_CLI} ps -aq --filter label=service=hyperledger-fabric) 2>/dev/null || true
${CONTAINER_CLI} rm -f $(${CONTAINER_CLI} ps -aq --filter name='dev-peer*') 2>/dev/null || true ${CONTAINER_CLI} rm -f $(${CONTAINER_CLI} ps -aq --filter name='dev-peer*') 2>/dev/null || true
${CONTAINER_CLI} kill "$(${CONTAINER_CLI} ps -q --filter name=ccaas)" 2>/dev/null || true
} }
# Delete any images that were generated as a part of this setup # Delete any images that were generated as a part of this setup
@ -345,8 +346,6 @@ function networkDown() {
clearContainers clearContainers
#Cleanup images #Cleanup images
removeUnwantedImages removeUnwantedImages
#
${CONTAINER_CLI} kill $(${CONTAINER_CLI} ps -q --filter name=ccaas) || true
# remove orderer block and other channel configuration transactions and certs # remove orderer block and other channel configuration transactions and certs
${CONTAINER_CLI} run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf system-genesis-block/*.block organizations/peerOrganizations organizations/ordererOrganizations' ${CONTAINER_CLI} run --rm -v "$(pwd):/data" busybox sh -c 'cd /data && rm -rf system-genesis-block/*.block organizations/peerOrganizations organizations/ordererOrganizations'
## remove fabric ca artifacts ## remove fabric ca artifacts