Skip to content

Commit 8dde85f

Browse files
dzikowskidzikowski
committed
Remove '*' from inside grep
Signed-off-by: Jakub Dzikowski <[email protected]>
1 parent 8f29739 commit 8dde85f

10 files changed

+27
-27
lines changed

‎e2e/__snapshots__/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.test.ts.snap‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,23 +2417,23 @@ networkDown() {
24172417
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
24182418
24192419
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
2420-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
2420+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
24212421
echo \\"Removing container $container...\\"
24222422
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24232423
done
24242424
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
24252425
echo \\"Removing image $image...\\"
24262426
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
24272427
done
2428-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
2428+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
24292429
echo \\"Removing container $container...\\"
24302430
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24312431
done
24322432
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode1*\\" -q); do
24332433
echo \\"Removing image $image...\\"
24342434
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
24352435
done
2436-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1*\\" | awk '{print $1}'); do
2436+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
24372437
echo \\"Removing container $container...\\"
24382438
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24392439
done

‎e2e/__snapshots__/fablo-config-hlf1.4-1org-1chaincode-raft.json.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,15 +1773,15 @@ networkDown() {
17731773
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
17741774
17751775
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
1776-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
1776+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
17771777
echo \\"Removing container $container...\\"
17781778
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
17791779
done
17801780
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
17811781
echo \\"Removing image $image...\\"
17821782
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
17831783
done
1784-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
1784+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
17851785
echo \\"Removing container $container...\\"
17861786
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
17871787
done

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-1chaincode.json.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,15 +2484,15 @@ networkDown() {
24842484
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
24852485
24862486
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
2487-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
2487+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
24882488
echo \\"Removing container $container...\\"
24892489
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24902490
done
24912491
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
24922492
echo \\"Removing image $image...\\"
24932493
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
24942494
done
2495-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1*\\" | awk '{print $1}'); do
2495+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
24962496
echo \\"Removing container $container...\\"
24972497
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24982498
done

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2475,47 +2475,47 @@ networkDown() {
24752475
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
24762476
24772477
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
2478-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-or-policy-chaincode*\\" | awk '{print $1}'); do
2478+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-or-policy-chaincode\\" | awk '{print $1}'); do
24792479
echo \\"Removing container $container...\\"
24802480
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24812481
done
24822482
for image in $(docker images \\"dev-peer0.org1.example.com-or-policy-chaincode*\\" -q); do
24832483
echo \\"Removing image $image...\\"
24842484
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
24852485
done
2486-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-or-policy-chaincode*\\" | awk '{print $1}'); do
2486+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-or-policy-chaincode\\" | awk '{print $1}'); do
24872487
echo \\"Removing container $container...\\"
24882488
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24892489
done
24902490
for image in $(docker images \\"dev-peer1.org1.example.com-or-policy-chaincode*\\" -q); do
24912491
echo \\"Removing image $image...\\"
24922492
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
24932493
done
2494-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-or-policy-chaincode*\\" | awk '{print $1}'); do
2494+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-or-policy-chaincode\\" | awk '{print $1}'); do
24952495
echo \\"Removing container $container...\\"
24962496
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
24972497
done
24982498
for image in $(docker images \\"dev-peer0.org2.example.com-or-policy-chaincode*\\" -q); do
24992499
echo \\"Removing image $image...\\"
25002500
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
25012501
done
2502-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-and-policy-chaincode*\\" | awk '{print $1}'); do
2502+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-and-policy-chaincode\\" | awk '{print $1}'); do
25032503
echo \\"Removing container $container...\\"
25042504
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
25052505
done
25062506
for image in $(docker images \\"dev-peer0.org1.example.com-and-policy-chaincode*\\" -q); do
25072507
echo \\"Removing image $image...\\"
25082508
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
25092509
done
2510-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-and-policy-chaincode*\\" | awk '{print $1}'); do
2510+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-and-policy-chaincode\\" | awk '{print $1}'); do
25112511
echo \\"Removing container $container...\\"
25122512
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
25132513
done
25142514
for image in $(docker images \\"dev-peer1.org1.example.com-and-policy-chaincode*\\" -q); do
25152515
echo \\"Removing image $image...\\"
25162516
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
25172517
done
2518-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-and-policy-chaincode*\\" | awk '{print $1}'); do
2518+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-and-policy-chaincode\\" | awk '{print $1}'); do
25192519
echo \\"Removing container $container...\\"
25202520
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
25212521
done

‎e2e/__snapshots__/fablo-config-hlf1.4-2orgs-2chaincodes-raft.json.test.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,31 +2699,31 @@ networkDown() {
26992699
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
27002700
27012701
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
2702-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
2702+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
27032703
echo \\"Removing container $container...\\"
27042704
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
27052705
done
27062706
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
27072707
echo \\"Removing image $image...\\"
27082708
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
27092709
done
2710-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1*\\" | awk '{print $1}'); do
2710+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
27112711
echo \\"Removing container $container...\\"
27122712
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
27132713
done
27142714
for image in $(docker images \\"dev-peer0.org2.example.com-chaincode1*\\" -q); do
27152715
echo \\"Removing image $image...\\"
27162716
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
27172717
done
2718-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode2*\\" | awk '{print $1}'); do
2718+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode2\\" | awk '{print $1}'); do
27192719
echo \\"Removing container $container...\\"
27202720
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
27212721
done
27222722
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode2*\\" -q); do
27232723
echo \\"Removing image $image...\\"
27242724
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
27252725
done
2726-
for container in $(docker ps -a | grep \\"dev-peer1.org2.example.com-chaincode2*\\" | awk '{print $1}'); do
2726+
for container in $(docker ps -a | grep \\"dev-peer1.org2.example.com-chaincode2\\" | awk '{print $1}'); do
27272727
echo \\"Removing container $container...\\"
27282728
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
27292729
done

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1772,7 +1772,7 @@ networkDown() {
17721772
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
17731773
17741774
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
1775-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
1775+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
17761776
echo \\"Removing container $container...\\"
17771777
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
17781778
done

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,15 +1724,15 @@ networkDown() {
17241724
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
17251725
17261726
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
1727-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
1727+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
17281728
echo \\"Removing container $container...\\"
17291729
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
17301730
done
17311731
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
17321732
echo \\"Removing image $image...\\"
17331733
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
17341734
done
1735-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
1735+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
17361736
echo \\"Removing container $container...\\"
17371737
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
17381738
done

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3611,31 +3611,31 @@ networkDown() {
36113611
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
36123612
36133613
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
3614-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
3614+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
36153615
echo \\"Removing container $container...\\"
36163616
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
36173617
done
36183618
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
36193619
echo \\"Removing image $image...\\"
36203620
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
36213621
done
3622-
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1*\\" | awk '{print $1}'); do
3622+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
36233623
echo \\"Removing container $container...\\"
36243624
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
36253625
done
36263626
for image in $(docker images \\"dev-peer0.org2.example.com-chaincode1*\\" -q); do
36273627
echo \\"Removing image $image...\\"
36283628
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
36293629
done
3630-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode2*\\" | awk '{print $1}'); do
3630+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode2\\" | awk '{print $1}'); do
36313631
echo \\"Removing container $container...\\"
36323632
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
36333633
done
36343634
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode2*\\" -q); do
36353635
echo \\"Removing image $image...\\"
36363636
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
36373637
done
3638-
for container in $(docker ps -a | grep \\"dev-peer1.org2.example.com-chaincode2*\\" | awk '{print $1}'); do
3638+
for container in $(docker ps -a | grep \\"dev-peer1.org2.example.com-chaincode2\\" | awk '{print $1}'); do
36393639
echo \\"Removing container $container...\\"
36403640
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
36413641
done

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3847,15 +3847,15 @@ networkDown() {
38473847
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
38483848
38493849
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
3850-
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
3850+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
38513851
echo \\"Removing container $container...\\"
38523852
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
38533853
done
38543854
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
38553855
echo \\"Removing image $image...\\"
38563856
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
38573857
done
3858-
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1*\\" | awk '{print $1}'); do
3858+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
38593859
echo \\"Removing container $container...\\"
38603860
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
38613861
done

‎src/setup-docker/templates/fabric-docker/commands-generated.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ networkDown() {
215215
<% chaincode.channel.orgs.forEach((org) => { -%>
216216
<% org.peers.forEach((peer) => { -%>
217217
<% const chaincodeContainerName=`dev-${peer.address}-${chaincode.name}` -%>
218-
for container in $(docker ps -a | grep "<%= chaincodeContainerName %>*" | awk '{print $1}'); do echo "Removing container $container..."; docker rm -f "$container" || echo "docker rm of $container failed. Check if all fabric dockers properly was deleted"; done
218+
for container in $(docker ps -a | grep "<%= chaincodeContainerName %>" | awk '{print $1}'); do echo "Removing container $container..."; docker rm -f "$container" || echo "docker rm of $container failed. Check if all fabric dockers properly was deleted"; done
219219
for image in $(docker images "<%= chaincodeContainerName %>*" -q); do echo "Removing image $image..."; docker rmi "$image" || echo "docker rmi of $image failed. Check if all fabric dockers properly was deleted"; done
220220
<% }) -%>
221221
<% }) -%>

0 commit comments

Comments
 (0)