dhti-cli 0.3.2 → 0.3.3

package/dist/commands/docker.d.ts

@@ -8,6 +8,7 @@ export default class Docker extends Command {
     static flags: {
         down: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         file: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        container: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         type: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         up: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/dist/commands/docker.js

@@ -9,12 +9,19 @@ export default class Docker extends Command {
         path: Args.string({ default: `${os.homedir()}/dhti`, description: 'Docker project path to build. Ex: dhti' }),
     };
     static description = 'Build a docker project and update docker-compose file';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
         down: Flags.boolean({ char: 'd', default: false, description: 'Run docker-compose down after building' }),
-        file: Flags.string({ char: 'f', default: `${os.homedir()}/dhti/docker-compose.yml`, description: 'Full path to the docker compose file to edit or run.' }),
+        file: Flags.string({
+            char: 'f',
+            default: `${os.homedir()}/dhti/docker-compose.yml`,
+            description: 'Full path to the docker compose file to edit or run.',
+        }),
+        container: Flags.string({
+            char: 'c',
+            default: 'dhti-langserve-1',
+            description: 'Name of the container to copy the bootstrap file to while in dev mode',
+        }),
         name: Flags.string({ char: 'n', description: 'Name of the container to build' }),
         type: Flags.string({ char: 't', default: 'elixir', description: 'Type of the service (elixir/conch)' }),
         up: Flags.boolean({ char: 'u', default: false, description: 'Run docker-compose up after building' }),
@@ -43,10 +50,36 @@ export default class Docker extends Command {
             });
             return;
         }
-        if (!flags.name && (!flags.up || !flags.down)) {
-            console.log("Please provide a name for the container to build");
+        if (args.path !== 'bootstrap' && !flags.name && !flags.up && !flags.down) {
+            console.log('Please provide a name for the container to build');
             this.exit(1);
         }
+        if (args.path === 'bootstrap') {
+            // if flags.file does not end with bootstrap.py then exit
+            if (!flags.file.endsWith('bootstrap.py')) {
+                console.log('Please provide a valid path to bootstrap.py file');
+                this.exit(1);
+            }
+            // copy -f to container:/app/app/ and only restart after copy completes
+            exec(`docker cp ${flags.file} ${flags.container}:/app/app/bootstrap.py`, (error, stdout, stderr) => {
+                if (error) {
+                    console.error(`exec error: ${error}`);
+                    return;
+                }
+                console.log(`stdout: ${stdout}`);
+                console.error(`stderr: ${stderr}`);
+                // restart the container only after copy completes
+                exec(`docker restart ${flags.container}`, (restartError, restartStdout, restartStderr) => {
+                    if (restartError) {
+                        console.error(`exec error: ${restartError}`);
+                        return;
+                    }
+                    console.log(`stdout: ${restartStdout}`);
+                    console.error(`stderr: ${restartStderr}`);
+                });
+            });
+            return;
+        }
         // cd to path, docker build tag with name
         const spinner = ora('Running docker build ..').start();
         exec(`cd ${args.path}/${flags.type} && docker build -t ${flags.name} . > /dev/null 2>&1`, (error, stdout, stderr) => {
@@ -60,15 +93,19 @@ export default class Docker extends Command {
             console.error(`stderr: ${stderr}`);
         });
         // read the docker-compose file
+        if (!fs.existsSync(flags.file)) {
+            console.error(`Error: The file "${flags.file}" does not exist.`);
+            this.exit(1);
+        }
         const dockerCompose = yaml.load(fs.readFileSync(flags.file, 'utf8'));
         // if type is elixir set image of backend to name, else set image of frontend to name
         if (flags.type === 'elixir') {
             dockerCompose.services.langserve.image = flags.name;
-            dockerCompose.services.langserve.pull_policy = "if_not_present";
+            dockerCompose.services.langserve.pull_policy = 'if_not_present';
         }
         else {
             dockerCompose.services.frontend.image = flags.name;
-            dockerCompose.services.frontend.pull_policy = "if_not_present";
+            dockerCompose.services.frontend.pull_policy = 'if_not_present';
         }
         // write the docker-compose file
         fs.writeFileSync(flags.file, yaml.dump(dockerCompose));

package/oclif.manifest.json

@@ -176,6 +176,15 @@
           "multiple": false,
           "type": "option"
         },
+        "container": {
+          "char": "c",
+          "description": "Name of the container to copy the bootstrap file to while in dev mode",
+          "name": "container",
+          "default": "dhti-langserve-1",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "name": {
           "char": "n",
           "description": "Name of the container to build",
@@ -440,5 +449,5 @@
       ]
     }
   },
-  "version": "0.3.2"
+  "version": "0.3.3"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dhti-cli",
   "description": "DHTI CLI",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "author": "Bell Eapen",
   "bin": {
     "dhti-cli": "bin/run.js"