test1

Author: OsamaRab3

src/setup-docker/templates/fabric-docker/commands-generated/chaincode-install-v2.sh

@@ -8,11 +8,29 @@
    - global
 */-%>
 printHeadline "Packaging chaincode '<%= chaincode.name %>'" "U1F60E"
-chaincodeBuild <% -%>
-  "<%= chaincode.name %>" <% -%>
-  "<%= chaincode.lang %>" <% -%>
-  "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>" <% -%>
-  "<%= global.fabricRecommendedNodeVersion %>"
+<% if (chaincode.image) { %>
+  printHeadline "Installing chaincode '<%= chaincode.name %>' from image" "U1F60E"
+  chaincodeInstallFromImage <% -%>
+    "<%= chaincode.instantiatingOrg.cli.address %>" <% -%>
+    "<%= chaincode.instantiatingOrg.headPeer.fullAddress %>" <% -%>
+    "<%= chaincode.name %>" <% -%>
+    "$version" <% -%>
+    "<%= chaincode.image %>" <% -%>
+<% } else { %>
+  printHeadline "Building and packaging chaincode '<%= chaincode.name %>'" "U1F60E"
+  chaincodeBuild <% -%>
+    "<%= chaincode.name %>" <% -%>
+    "<%= chaincode.lang %>" <% -%>
+    "$CHAINCODES_BASE_DIR/<%= chaincode.directory %>" <% -%>
+    "<%= global.fabricRecommendedNodeVersion %>"
+  chaincodePackage <% -%>
+    "<%= chaincode.instantiatingOrg.cli.address %>" <% -%>
+    "<%= chaincode.instantiatingOrg.headPeer.fullAddress %>" <% -%>
+    "<%= chaincode.name %>" <% -%>
+    "$version" <% -%>
+    "<%= chaincode.lang %>" <% -%>
+<% } %>
+
 chaincodePackage <% -%>
   "<%= chaincode.instantiatingOrg.cli.address %>" <% -%>
   "<%= chaincode.instantiatingOrg.headPeer.fullAddress %>" <% -%>
@@ -22,24 +40,22 @@ chaincodePackage <% -%>
 <% chaincode.channel.orgs.forEach((org) => { -%>
   printHeadline "Installing '<%= chaincode.name %>' for <%= org.name %>" "U1F60E"
   <% org.peers.forEach((peer) => { -%>
-    chaincodeInstall <% -%>
-      "<%= org.cli.address %>" <% -%>
-      "<%= peer.fullAddress %>" <% -%>
-      "<%= chaincode.name %>" <% -%>
-      "$version" <% -%>
-      "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>"
+    <% if (chaincode.image) { %>
+      chaincodeInstallFromImage <% -%>
+        "<%= org.cli.address %>" <% -%>
+        "<%= peer.fullAddress %>" <% -%>
+        "<%= chaincode.name %>" <% -%>
+        "$version" <% -%>
+        "<%= chaincode.image %>" <% -%>
+    <% } else { %>
+      chaincodeInstall <% -%>
+        "<%= org.cli.address %>" <% -%>
+        "<%= peer.fullAddress %>" <% -%>
+        "<%= chaincode.name %>" <% -%>
+        "$version" <% -%>
+        "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>"
+    <% } %>
   <% }) -%>
-  chaincodeApprove <% -%>
-    "<%= org.cli.address %>" <% -%>
-    "<%= org.headPeer.fullAddress %>" <% -%>
-    "<%= chaincode.channel.name %>" <% -%>
-    "<%= chaincode.name %>" <% -%>
-    "$version" <% -%>
-    "<%= chaincode.channel.ordererHead.fullAddress %>" <% -%>
-    "<%- chaincode.endorsement || '' %>" <% -%>
-    "<%= `${chaincode.initRequired}` %>" <% -%>
-    "<%= !global.tls ? '' : `crypto-orderer/tlsca.${chaincode.channel.ordererHead.domain}-cert.pem` %>" <% -%>
-    "<%= chaincode.privateDataConfigFile || '' %>"
 <% }) -%>
 printItalics "Committing chaincode '<%= chaincode.name %>' on channel '<%= chaincode.channel.name %>' as '<%= chaincode.instantiatingOrg.name %>'" "U1F618"
 chaincodeCommit <% -%>

src/setup-docker/templates/fabric-docker/scripts/chaincode-functions-v2.sh

@@ -399,3 +399,40 @@ peerChaincodeInvokeTls() {
     --cafile "/var/hyperledger/cli/$CA_CERT" \
     2>&1
 }
+
+chaincodeInstallFromImage() {
+  local CLI_NAME=$1
+  local PEER_ADDRESS=$2
+  local CHAINCODE_NAME=$3
+  local CHAINCODE_VERSION=$4
+  local CHAINCODE_LABEL="${CHAINCODE_NAME}_$CHAINCODE_VERSION"
+  local IMAGE_NAME=$5
+  local IMAGE_TAG=$6
+  local CA_CERT=$7
+
+  echo "Installing external chaincode $CHAINCODE_NAME from image $IMAGE_NAME:$IMAGE_TAG..."
+  inputLog "CLI_NAME: $CLI_NAME"
+  inputLog "PEER_ADDRESS: $PEER_ADDRESS"
+  inputLog "CHAINCODE_NAME: $CHAINCODE_NAME"
+  inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
+  inputLog "CHAINCODE_LABEL: $CHAINCODE_LABEL"
+  inputLog "IMAGE_NAME: $IMAGE_NAME"
+  inputLog "IMAGE_TAG: $IMAGE_TAG"
+  inputLog "CA_CERT: $CA_CERT"
+
+  local CA_CERT_PARAMS=()
+  if [ -n "$CA_CERT" ]; then
+    CA_CERT_PARAMS=(--tlsRootCertFiles "/var/hyperledger/cli/$CA_CERT")
+  fi
+
+  # Pull the chaincode image if it doesn't exist
+  dockerPullIfMissing "$IMAGE_NAME:$IMAGE_TAG"
+
+  # Register the external chaincode image as installed
+  docker exec -e CORE_PEER_ADDRESS="$PEER_ADDRESS" "$CLI_NAME" peer lifecycle chaincode installexternal \
+    --name "$CHAINCODE_NAME" \
+    --version "$CHAINCODE_VERSION" \
+    --label "$CHAINCODE_LABEL" \
+    --image "$IMAGE_NAME:$IMAGE_TAG" \
+    "${CA_CERT_PARAMS[@]+"${CA_CERT_PARAMS[@]}"}"
+}

src/types/FabloConfigExtended.ts

@@ -146,7 +146,8 @@ export interface OrgConfig {
 }
 
 export interface ChaincodeConfig {
-  directory: string;
+  directory?: string;
+  image?: string;
   name: string;
   version: string;
   lang: string;

src/types/FabloConfigJson.ts

@@ -59,7 +59,8 @@ export interface ChaincodeJson {
   init?: string;
   initRequired?: boolean;
   endorsement?: string;
-  directory: string;
+  directory?: string;
+  image?: string;
   privateData: PrivateDataJson[];
 }