Iterate on docker entrypoint and init command

Signed-off-by: Jakub Dzikowski <[email protected]>

Author: dzikowski

docker-entrypoint.sh

@@ -57,8 +57,18 @@ case "$oclif_command" in
     ;;
 esac
 
+# Build command with all arguments (mapped command + remaining args)
+# Replace first argument with mapped command, then pass all args
+if [ $# -gt 0 ]; then
+  shift
+  set -- "$oclif_command" "$@"
+else
+  set -- "$oclif_command"
+fi
+command_with_args="$*"
+
 # Execute the command
-executeOclifCommand "$oclif_command"
+executeOclifCommand "$command_with_args"
 
 if echo "$oclif_command" | grep -q "setup-network"; then
   formatGeneratedFiles

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

@@ -10,7 +10,7 @@ export FABLO_HOME
 
 networkUp() {
   "$FABLO_HOME/fablo-build.sh"
-  (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" init)
+  (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" init --node && cat "$TEST_TMP/fablo-config.json")
   (cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" up)
 }
 

fablo.sh

@@ -190,6 +190,7 @@ printHelp() {
 }
 
 executeOnFabloDocker() {
+  set -x
   local command_with_params="$1"
   local fablo_workspace="${2:-$FABLO_TEMP_DIR}"
   local fablo_config="$3"
@@ -218,7 +219,7 @@ executeOnFabloDocker() {
     "${fablo_workspace_params[@]}" \
     "${fablo_config_params[@]}" \
     -u "$(id -u):$(id -g)" \
-    $FABLO_IMAGE sh -c "/fablo/docker-entrypoint.sh \"$command_with_params\"" \
+    $FABLO_IMAGE sh -c "/fablo/docker-entrypoint.sh $command_with_params" \
     2>&1
 }
 
@@ -237,7 +238,7 @@ useVersion() {
 
 initConfig() {
   printSplash
-  executeOnFabloDocker "init $1 $2"
+  executeOnFabloDocker "init \"$1\" \"$2\" \"$3\" \"$4\" \"$5\""
   cp -R -i "$FABLO_TEMP_DIR/." "$COMMAND_CALL_ROOT/"
 }
 

src/commands/init/index.ts

@@ -1,4 +1,4 @@
-import { Args, Command } from '@oclif/core'
+import { Command, Flags } from '@oclif/core'
 import * as chalk from "chalk";
 import { GlobalJson, FabloConfigJson, ChaincodeJson } from "../../types/FabloConfigJson";
 import * as path from 'path';
@@ -72,23 +72,19 @@ export default class Init extends Command {
   static override description =
     "Creates simple Fablo config in current directory with optional Node.js, chaincode, REST API and dev mode";
 
-  static args = {
-    feat: Args.string({
-      description: 'feature node,dev,ccass,gateway,rest',
-      multiple: true
-    })
-  }
+  static flags = {
+    node: Flags.boolean({ description: 'Include Node.js chaincode sample' }),
+    dev: Flags.boolean({ description: 'Enable dev mode (dev chaincodes)' }),
+    ccaas: Flags.boolean({ description: 'Include CCAAS chaincode sample' }),
+    gateway: Flags.boolean({ description: 'Include Gateway app sample' }),
+    rest: Flags.boolean({ description: 'Include REST API sample' }),
+  };
+
   async copySampleConfig(): Promise<void> {
     let fabloConfigJson = getDefaultFabloConfig();
-    const { args } = await this.parse(Init);
-
-
-    const features: string[] = Array.isArray(args.feat) ? args.feat : args.feat ? [args.feat] : [];
+    const { flags } = await this.parse(Init);
 
-    const flags: Record<string, true> = features.reduce<Record<string, true>>((acc, v) => {
-      acc[v] = true;
-      return acc;
-    }, {});
+    console.log("init flags: ", JSON.stringify(flags, null, 2));
 
     if (flags.ccaas) {
       if (flags.dev || flags.node) {
@@ -167,7 +163,7 @@ export default class Init extends Command {
       fabloConfigJson = { ...fabloConfigJson, orgs };
     }
 
-    const engine = flags.kubernetes || flags.k8s ? "kubernetes" : "docker";
+    const engine = "docker";
 
     const global: GlobalJson = {
       ...fabloConfigJson.global,