Running chaincode from docker image - CCaaS

.github/workflows/publish-docker-on-main.yml

@@ -39,4 +39,4 @@ jobs:
             --platform linux/amd64,linux/arm64 \
             --tag "ghcr.io/fablo-io/fablo-kv-node-chaincode-sample:$FABLO_VERSION" \
             --push \
-            samples/chaincodes/chaincode-kv-node
+            samples/chaincodes/chaincode-kv-node

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

@@ -239,4 +239,4 @@ jobs:
           name: test-05-version3-BFT-snapshot
           path: |
             e2e-network/docker/test-06-v3-bft.sh.logs/*
-            e2e-network/docker/test-06-v3-bft.sh.tmpdir/fablo-target/**/*
+            e2e-network/docker/test-06-v3-bft.sh.tmpdir/fablo-target/**/*

.gitignore

@@ -7,4 +7,4 @@ node_modules
 .idea
 .vscode
 samples/invalid-fablo-config.json
-.DS_Store
+.DS_Store

CHANGELOG.md

@@ -9,6 +9,9 @@
   [#569](https://github.com/hyperledger-labs/fablo/pull/569)
 * Export network topology with Mermaid 
   [#565](https://github.com/hyperledger-labs/fablo/pull/565)
+* Support installing Chaincode from Docker image using CCaaS
+  [#550](https://github.com/hyperledger-labs/fablo/pull/550)
+  [#582](https://github.com/hyperledger-labs/fablo/pull/582)
 
 
 ## 2.2.0

docs/schema.json

@@ -416,8 +416,20 @@
           "name",
           "version",
           "lang",
-          "channel",
-          "directory"
+          "channel"
+        ],
+        "allOf": [
+          {
+            "if": {
+              "properties": { "lang": { "const": "ccaas"}}
+            },
+            "then": {
+              "required": [ "image"]
+            },
+            "else": {
+              "required": [ "directory" ]
+            }
+          }
         ],
         "properties": {
           "name": {
@@ -439,7 +451,8 @@
             "enum": [
               "golang",
               "java",
-              "node"
+              "node",
+              "ccaas"
             ]
           },
           "channel": {
@@ -478,6 +491,11 @@
             "title": "Chaincode directory",
             "type": "string"
           },
+          "image": {
+            "$id": "#/properties/chaincodes/items/properties/image",
+            "title": "Chaincode image URI",
+            "type": "string"
+          },
           "privateData": {
             "$id": "#/properties/chaincodes/items/properties/privateData",
             "title": "Private data collections",

e2e-network/docker/test-01-v2-simple.sh

@@ -49,7 +49,7 @@ trap 'networkDown ; echo "Test failed" ; exit 1' ERR SIGINT
 networkUp
 
 waitForContainer "orderer0.group1.orderer.example.com" "Created and started new.*my-channel1"
-waitForContainer "ca.org1.example.com" "Listening on http://0.0.0.0:7054"
+waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
 waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
 waitForContainer "peer1.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
 waitForContainer "peer0.org1.example.com" "Learning about the configured anchor peers of Org1MSP for channel my-channel1"
@@ -89,4 +89,6 @@ expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
 # Put some data again
 expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
   '{"Args":["KVContract:put", "name", "James Bond"]}' \
-  '{\"success\":\"OK\"}'
+  '{\"success\":\"OK\"}'
+
+echo "✅ Test passed!"

e2e-network/docker/test-04-v2-snapshot.sh

@@ -128,3 +128,5 @@ expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
 expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
   "KVContract:getPrivateMessage" '["_implicit_org_Org1MSP"]' \
   '{"success":"RHIgVmljdG9yIEZyaWVz"}'
+
+echo "✅ Test passed!"