Skip to content

Commit f2a465d

Browse files
dzikowskidzikowski
authored
Merge pull request #334 from dzikowski/release-1.1
Release 1.1
2 parents 66fc4d5 + 6cdd70f commit f2a465d

38 files changed

+441
-224
lines changed

‎.github/workflows/test-on-push.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
uses: rtCamp/action-slack-notify@v2
1414
env:
1515
SLACK_USERNAME: Fablo CI
16-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
16+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
1717
SLACK_COLOR: '#ffd963'
1818
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
1919
MSG_MINIMAL: ref
20-
SLACK_FOOTER: 'Workflow <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}*> started'
20+
SLACK_FOOTER: 'Workflow <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}*> started'
2121

2222
- name: Check out repository code
2323
uses: actions/checkout@v2
@@ -55,11 +55,11 @@ jobs:
5555
uses: rtCamp/action-slack-notify@v2
5656
env:
5757
SLACK_USERNAME: Fablo CI
58-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
58+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
5959
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
6060
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
6161
MSG_MINIMAL: ref
62-
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
62+
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
6363

6464
test-02-raft:
6565
needs: test-main
@@ -91,11 +91,11 @@ jobs:
9191
uses: rtCamp/action-slack-notify@v2
9292
env:
9393
SLACK_USERNAME: Fablo CI
94-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
94+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
9595
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
9696
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
9797
MSG_MINIMAL: ref
98-
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
98+
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
9999

100100
test-03-private-data:
101101
needs: test-main
@@ -127,11 +127,11 @@ jobs:
127127
uses: rtCamp/action-slack-notify@v2
128128
env:
129129
SLACK_USERNAME: Fablo CI
130-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
130+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
131131
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
132132
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
133133
MSG_MINIMAL: ref
134-
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
134+
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
135135

136136
test-04-snapshot:
137137
needs: test-main
@@ -163,11 +163,11 @@ jobs:
163163
uses: rtCamp/action-slack-notify@v2
164164
env:
165165
SLACK_USERNAME: Fablo CI
166-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
166+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
167167
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
168168
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
169169
MSG_MINIMAL: ref
170-
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
170+
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
171171

172172
node-chaincodes-unit-tests:
173173
needs: test-main
@@ -195,8 +195,8 @@ jobs:
195195
uses: rtCamp/action-slack-notify@v2
196196
env:
197197
SLACK_USERNAME: Fablo CI
198-
SLACK_ICON: 'https://raw.githubusercontent.com/softwaremill/fablo/main/logo-sygnet-192.png'
198+
SLACK_ICON: 'https://raw.githubusercontent.com/hyperledger-labs/fablo/main/logo-sygnet-192.png'
199199
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
200200
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
201201
MSG_MINIMAL: ref
202-
SLACK_FOOTER: 'Job <https://github.com/softwaremill/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'
202+
SLACK_FOOTER: 'Job <https://github.com/hyperledger-labs/fablo/commit/${{ github.sha }}/checks|*${{ github.workflow }}/${{ github.job }}*> ended with status: *${{ job.status }}*'

‎CHANGELOG.md‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 1.1.0-unstable
1+
## 1.1.0
22

33
### Features
44
* Support Fabric Gateway since Fabric 2.4 [#305](https://github.com/hyperledger-labs/fablo/issues/305)
@@ -12,10 +12,12 @@
1212
### Fixes
1313
* Support Apple M1 / arm64 architecture
1414
* Various fixes in channel scripts
15+
* Remove remaining docker containers and images after prune
1516

1617
### Chore & Maintenance
1718
* Add `fabricNodeenvVersion` global configuration
1819
* Update Node.js runtime compatibility ([details](https://github.com/hyperledger-labs/fablo/issues/274))
20+
* Update legacy URLs
1921

2022
## 1.0.2
2123

@@ -47,29 +49,29 @@
4749
* Add [Fablo REST](https://github.com/softwaremill/fablo-rest/) support
4850
* By default all peers are anchor peers
4951
* Support `postGenerate` hook
50-
* Added support for [Orderer sharding](https://github.com/softwaremill/fablo/issues/220) (multiple orderer groups).
51-
* Support for [Orderer groups](https://github.com/softwaremill/fablo/issues/238) (orderer group can be spread between many orgs).
52+
* Added support for [Orderer sharding](https://github.com/hyperledger-labs/fablo/issues/220) (multiple orderer groups).
53+
* Support for [Orderer groups](https://github.com/hyperledger-labs/fablo/issues/238) (orderer group can be spread between many orgs).
5254

5355
### Fixes
5456
* Fixed issue with bad `requiredPeerCount` in private data collection
55-
* Fixed issues with `fablo up` on older bash versions ([details](https://github.com/softwaremill/fablo/issues/210))
57+
* Fixed issues with `fablo up` on older bash versions ([details](https://github.com/hyperledger-labs/fablo/issues/210))
5658

5759
### Chore & Maintenance
5860

5961
## 0.2.0
6062
* Rename Fabrica to Fablo
6163

6264
## 0.1.1
63-
* Broken Node.js chaincode build ([#211](https://github.com/softwaremill/fablo/pull/211))
65+
* Broken Node.js chaincode build ([#211](https://github.com/hyperledger-labs/fablo/pull/211))
6466

6567
## 0.1.0
6668

6769
### Features
68-
* Support for private data ([#104](https://github.com/softwaremill/fablo/issues/104))
69-
* Added channel query scripts ([#169](https://github.com/softwaremill/fablo/issues/169))
70-
* Support for Hyperledger Fabric 2.x ([#132](https://github.com/softwaremill/fablo/issues/132)
71-
, [#178](https://github.com/softwaremill/fablo/issues/178), [#190](https://github.com/softwaremill/fablo/issues/178))
72-
* Support default endorsement policy ([#189](https://github.com/softwaremill/fablo/issues/189))
70+
* Support for private data ([#104](https://github.com/hyperledger-labs/fablo/issues/104))
71+
* Added channel query scripts ([#169](https://github.com/hyperledger-labs/fablo/issues/169))
72+
* Support for Hyperledger Fabric 2.x ([#132](https://github.com/hyperledger-labs/fablo/issues/132)
73+
, [#178](https://github.com/hyperledger-labs/fablo/issues/178), [#190](https://github.com/hyperledger-labs/fablo/issues/178))
74+
* Support default endorsement policy ([#189](https://github.com/hyperledger-labs/fablo/issues/189))
7375
* Support for fablo config in YAML format
7476

7577
### Chore & Maintenance
@@ -82,26 +84,26 @@
8284
* Generate simple Hyperledger Fabric network
8385
* Support for multiple organizations
8486
* Support for solo consensus protocol
85-
* Support for RAFT consensus protocol ([#16](https://github.com/softwaremill/fablo/issues/16)
86-
, [#38](https://github.com/softwaremill/fablo/issues/38))
87+
* Support for RAFT consensus protocol ([#16](https://github.com/hyperledger-labs/fablo/issues/16)
88+
, [#38](https://github.com/hyperledger-labs/fablo/issues/38))
8789
* Validation of `fablo-config.json` based on JSON schema and other rules
88-
* Allow to upgrade chaincode ([#45](https://github.com/softwaremill/fablo/issues/36))
89-
* Network recreation in one step ([#105](https://github.com/softwaremill/fablo/issues/105))
90-
* Init command to provide simple config ([#90](https://github.com/softwaremill/fablo/issues/90)) with
91-
chaincode ([#100](https://github.com/softwaremill/fablo/issues/100))
90+
* Allow to upgrade chaincode ([#45](https://github.com/hyperledger-labs/fablo/issues/36))
91+
* Network recreation in one step ([#105](https://github.com/hyperledger-labs/fablo/issues/105))
92+
* Init command to provide simple config ([#90](https://github.com/hyperledger-labs/fablo/issues/90)) with
93+
chaincode ([#100](https://github.com/hyperledger-labs/fablo/issues/100))
9294
* Proper exposing Orderer and Peers ports for service
93-
discovery ([#116](https://github.com/softwaremill/fablo/issues/116))
95+
discovery ([#116](https://github.com/hyperledger-labs/fablo/issues/116))
9496

9597
### Fixes
96-
* Missing notify anchor peers step ([#26](https://github.com/softwaremill/fablo/issues/26))
98+
* Missing notify anchor peers step ([#26](https://github.com/hyperledger-labs/fablo/issues/26))
9799

98100
### Chore & Maintenance
99-
* Lint bash and YAML files ([#48](https://github.com/softwaremill/fablo/issues/48))
100-
* Format generated scripts and YAML files ([#75](https://github.com/softwaremill/fablo/issues/75))
101-
* Test Java chaincode on generated network ([#25](https://github.com/softwaremill/fablo/issues/25))
102-
* Test JS chaincode on generated network ([#46](https://github.com/softwaremill/fablo/issues/46))
103-
* Test generated Hyperledger Fabric networks ([#36](https://github.com/softwaremill/fablo/issues/36))
104-
* Test generators with simple snapshot tests ([#5](https://github.com/softwaremill/fablo/issues/5))
105-
* Lint JS files ([#1](https://github.com/softwaremill/fablo/issues/1))
101+
* Lint bash and YAML files ([#48](https://github.com/hyperledger-labs/fablo/issues/48))
102+
* Format generated scripts and YAML files ([#75](https://github.com/hyperledger-labs/fablo/issues/75))
103+
* Test Java chaincode on generated network ([#25](https://github.com/hyperledger-labs/fablo/issues/25))
104+
* Test JS chaincode on generated network ([#46](https://github.com/hyperledger-labs/fablo/issues/46))
105+
* Test generated Hyperledger Fabric networks ([#36](https://github.com/hyperledger-labs/fablo/issues/36))
106+
* Test generators with simple snapshot tests ([#5](https://github.com/hyperledger-labs/fablo/issues/5))
107+
* Lint JS files ([#1](https://github.com/hyperledger-labs/fablo/issues/1))
106108
* Run Yeoman generators inside Docker container
107109

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,4 +557,6 @@ Provide for your organization `"tools": { "explorer": true }`, if you want to us
557557
558558
## Testimonials
559559
560-
Fablo was originally created at [SoftwareMill](https://softwaremill.com).
560+
Fablo was originally created at [SoftwareMill](https://softwaremill.com) by [@Hejwo](https://github.com/Hejwo/) and [@dzikowski](https://github.com/dzikowski/).
561+
In December 2021, Fablo joined [Hyperledger Labs](https://labs.hyperledger.org/).
562+

‎docs/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<html>
22
<head>
3-
<meta http-equiv="refresh" content="0;url=https://github.com/softwaremill/fablo" />
3+
<meta http-equiv="refresh" content="0;url=https://github.com/hyperledger-labs/fablo" />
44
<title>Redirecting to main repo page</title>
55
</head>
66
<body>
7-
<p>Redirecting to <a href="https://github.com/softwaremill/fablo">https://github.com/softwaremill/fablo</a>...</p>
7+
<p>Redirecting to <a href="https://github.com/hyperledger-labs/fablo">https://github.com/hyperledger-labs/fablo</a>...</p>
88
</body>
99
</html>

‎docs/sample.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/softwaremill/fablo/releases/download/1.1.0-unstable/schema.json",
2+
"$schema": "https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/schema.json",
33
"global": {
44
"fabricVersion": "2.3.2",
55
"tls": false,

‎docs/schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"properties": {
1414
"$schema": {
15-
"const": "https://github.com/softwaremill/fablo/releases/download/1.1.0-unstable/schema.json"
15+
"const": "https://github.com/hyperledger-labs/fablo/releases/download/1.1.0/schema.json"
1616
},
1717
"global": {
1818
"$id": "#/properties/global",

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

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@ networkUp() {
20382038
installChannels
20392039
installChaincodes
20402040
notifyOrgsAboutChannels
2041-
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
2041+
printStartSuccessInfo
20422042
}
20432043
20442044
if [ \\"$1\\" = \\"up\\" ]; then
@@ -2081,7 +2081,7 @@ fi
20812081
`;
20822082
20832083
exports[`samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.3-2orgs-1chaincode-private-data.json 1`] = `
2084-
"FABLO_VERSION=1.1.0-unstable
2084+
"FABLO_VERSION=1.1.0
20852085
FABLO_BUILD=<date with git hash>
20862086
FABLO_REST_VERSION=0.1.0
20872087
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -2406,6 +2406,10 @@ notifyOrgsAboutChannels() {
24062406
deleteNewChannelUpdateTx \\"my-channel1\\" \\"Org2MSP\\" \\"cli.org2.example.com\\"
24072407
}
24082408
2409+
printStartSuccessInfo() {
2410+
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
2411+
}
2412+
24092413
stopNetwork() {
24102414
printHeadline \\"Stopping network\\" \\"U1F68F\\"
24112415
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose stop)
@@ -2417,12 +2421,30 @@ networkDown() {
24172421
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
24182422
24192423
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
2420-
docker rm -f $(docker ps -a | grep dev-peer0.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2421-
docker rmi $(docker images dev-peer0.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2422-
docker rm -f $(docker ps -a | grep dev-peer1.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2423-
docker rmi $(docker images dev-peer1.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2424-
docker rm -f $(docker ps -a | grep dev-peer0.org2.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2425-
docker rmi $(docker images dev-peer0.org2.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
2424+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
2425+
echo \\"Removing container $container...\\"
2426+
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
2427+
done
2428+
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
2429+
echo \\"Removing image $image...\\"
2430+
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
2431+
done
2432+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
2433+
echo \\"Removing container $container...\\"
2434+
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
2435+
done
2436+
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode1*\\" -q); do
2437+
echo \\"Removing image $image...\\"
2438+
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
2439+
done
2440+
for container in $(docker ps -a | grep \\"dev-peer0.org2.example.com-chaincode1\\" | awk '{print $1}'); do
2441+
echo \\"Removing container $container...\\"
2442+
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
2443+
done
2444+
for image in $(docker images \\"dev-peer0.org2.example.com-chaincode1*\\" -q); do
2445+
echo \\"Removing image $image...\\"
2446+
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
2447+
done
24262448
24272449
printf \\"\\\\nRemoving generated configs... \\\\U1F5D1 \\\\n\\"
24282450
rm -rf \\"$FABLO_NETWORK_ROOT/fabric-config/config\\"

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

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ networkUp() {
14491449
installChannels
14501450
installChaincodes
14511451
notifyOrgsAboutChannels
1452-
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
1452+
printStartSuccessInfo
14531453
}
14541454
14551455
if [ \\"$1\\" = \\"up\\" ]; then
@@ -1492,7 +1492,7 @@ fi
14921492
`;
14931493
14941494
exports[`samples/fablo-config-hlf1.4-1org-1chaincode-raft.json should create proper e2e/__tmp__/samples/fablo-config-hlf1.4-1org-1chaincode-raft.json.tmpdir/fablo-target/fabric-docker/.env from samples/fablo-config-hlf1.4-1org-1chaincode-raft.json 1`] = `
1495-
"FABLO_VERSION=1.1.0-unstable
1495+
"FABLO_VERSION=1.1.0
14961496
FABLO_BUILD=<date with git hash>
14971497
FABLO_REST_VERSION=0.1.0
14981498
HYPERLEDGER_EXPLORER_VERSION=1.1.8
@@ -1762,6 +1762,10 @@ notifyOrgsAboutChannels() {
17621762
deleteNewChannelUpdateTx \\"my-channel1\\" \\"Org1MSP\\" \\"cli.org1.example.com\\"
17631763
}
17641764
1765+
printStartSuccessInfo() {
1766+
printHeadline \\"Done! Enjoy your fresh network\\" \\"U1F984\\"
1767+
}
1768+
17651769
stopNetwork() {
17661770
printHeadline \\"Stopping network\\" \\"U1F68F\\"
17671771
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose stop)
@@ -1773,10 +1777,22 @@ networkDown() {
17731777
(cd \\"$FABLO_NETWORK_ROOT\\"/fabric-docker && docker-compose down)
17741778
17751779
printf \\"\\\\nRemoving chaincode containers & images... \\\\U1F5D1 \\\\n\\"
1776-
docker rm -f $(docker ps -a | grep dev-peer0.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
1777-
docker rmi $(docker images dev-peer0.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
1778-
docker rm -f $(docker ps -a | grep dev-peer1.org1.example.com-chaincode1-0.0.1-* | awk '{print $1}') || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
1779-
docker rmi $(docker images dev-peer1.org1.example.com-chaincode1-0.0.1-* -q) || echo \\"docker rm failed, Check if all fabric dockers properly was deleted\\"
1780+
for container in $(docker ps -a | grep \\"dev-peer0.org1.example.com-chaincode1\\" | awk '{print $1}'); do
1781+
echo \\"Removing container $container...\\"
1782+
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
1783+
done
1784+
for image in $(docker images \\"dev-peer0.org1.example.com-chaincode1*\\" -q); do
1785+
echo \\"Removing image $image...\\"
1786+
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
1787+
done
1788+
for container in $(docker ps -a | grep \\"dev-peer1.org1.example.com-chaincode1\\" | awk '{print $1}'); do
1789+
echo \\"Removing container $container...\\"
1790+
docker rm -f \\"$container\\" || echo \\"docker rm of $container failed. Check if all fabric dockers properly was deleted\\"
1791+
done
1792+
for image in $(docker images \\"dev-peer1.org1.example.com-chaincode1*\\" -q); do
1793+
echo \\"Removing image $image...\\"
1794+
docker rmi \\"$image\\" || echo \\"docker rmi of $image failed. Check if all fabric dockers properly was deleted\\"
1795+
done
17801796
17811797
printf \\"\\\\nRemoving generated configs... \\\\U1F5D1 \\\\n\\"
17821798
rm -rf \\"$FABLO_NETWORK_ROOT/fabric-config/config\\"

0 commit comments

Comments
 (0)