@enspirit/emb 0.4.1 → 0.4.2

package/README.md

@@ -14,7 +14,7 @@ $ npm install -g @enspirit/emb
 $ emb COMMAND
 running command...
 $ emb (--version)
-@enspirit/emb/0.4.1 darwin-x64 node-v22.18.0
+@enspirit/emb/0.4.2 darwin-x64 node-v22.18.0
 $ emb --help [COMMAND]
 USAGE
   $ emb COMMAND

package/dist/src/cli/commands/up.js

@@ -20,9 +20,6 @@ export default class UpCommand extends FlavoredCommand {
         if (flags.force) {
             buildFlags.push('--force');
         }
-        if (flags.flavor) {
-            buildFlags.push('--flavor', flags.flavor);
-        }
         await this.config.runCommand('resources:build', buildFlags);
         await monorepo.run(new ComposeUpOperation(), {
             forceRecreate: flags.force,

package/dist/src/docker/operations/images/BuildImageOperation.d.ts

@@ -17,4 +17,9 @@ export declare class BuildImageOperation extends AbstractOperation<typeof BuildI
     private out?;
     constructor(out?: Writable | undefined);
     protected _run(input: z.input<typeof BuildImageOperationInputSchema>): Promise<void>;
+    protected _buildWithDockerCLI(input: z.input<typeof BuildImageOperationInputSchema>): Promise<void>;
+    /**
+     * Experimental with dockerode and the docker API directly
+     */
+    protected _buildWithDockerode(input: z.input<typeof BuildImageOperationInputSchema>): Promise<void>;
 }

package/dist/src/docker/operations/images/BuildImageOperation.js

@@ -1,4 +1,7 @@
-import { Transform } from 'node:stream';
+import { CommandExecError } from '../../../index.js';
+import { spawn } from 'node:child_process';
+import { join } from 'node:path';
+import { PassThrough } from 'node:stream';
 import * as z from 'zod';
 import { decodeBuildkitStatusResponse } from '../../index.js';
 import { AbstractOperation } from '../../../operations/index.js';
@@ -37,28 +40,61 @@ export class BuildImageOperation extends AbstractOperation {
         this.out = out;
     }
     async _run(input) {
+        return this._buildWithDockerCLI(input);
+    }
+    async _buildWithDockerCLI(input) {
+        const labels = Object.entries(input.labels || {})
+            .reduce((arr, [key, value]) => {
+            arr.push(`${key.trim()}=${value.trim()}`);
+            return arr;
+        }, [])
+            .join(',');
+        const args = [
+            'build',
+            input.context,
+            '-f',
+            join(input.context, input.dockerfile || 'Dockerfile'),
+            '--label',
+            labels,
+        ];
+        if (input.tag) {
+            args.push('--tag', input.tag);
+        }
+        if (input.target) {
+            args.push('--target', input.target);
+        }
+        Object.entries(input.buildArgs || []).forEach(([key, value]) => {
+            args.push('--build-arg', `${key.trim()}=${value.trim()}`);
+        });
         const logFile = await this.context.monorepo.store.createWriteStream(`logs/docker/build/${input.tag}.log`);
-        const decodeBuildkit = new Transform({
-            transform: async (chunk, encoding, callback) => {
-                try {
-                    try {
-                        const { aux } = JSON.parse(chunk);
-                        const { vertexes } = await decodeBuildkitStatusResponse(aux);
-                        vertexes.forEach((v) => {
-                            logFile.write(`${JSON.stringify(v)}\n`);
-                            this.out?.write(`${v.name}\n`);
-                        });
-                    }
-                    catch {
-                        //
-                    }
-                    callback();
-                }
-                catch (error) {
-                    console.error('__OOPS', error);
+        const tee = new PassThrough();
+        tee.pipe(logFile);
+        if (this.out) {
+            tee.pipe(this.out);
+        }
+        tee.write('Building image with opts: ' + JSON.stringify(args));
+        const child = await spawn('docker', args);
+        child.stderr.pipe(tee);
+        child.stdout.pipe(tee);
+        return new Promise((resolve, reject) => {
+            child.on('close', () => {
+                resolve();
+            });
+            child.on('exit', (code, signal) => {
+                if (code !== 0) {
+                    reject(new CommandExecError('Docker build failed', code || -1, signal));
                 }
-            },
+            });
+            child.on('error', (err) => {
+                reject(err);
+            });
         });
+    }
+    /**
+     * Experimental with dockerode and the docker API directly
+     */
+    async _buildWithDockerode(input) {
+        const logFile = await this.context.monorepo.store.createWriteStream(`logs/docker/build/${input.tag}.log`);
         const stream = await this.context.docker.buildImage({
             context: input.context,
             src: [...input.src],
@@ -71,9 +107,28 @@ export class BuildImageOperation extends AbstractOperation {
             version: '2',
         });
         return new Promise((resolve, reject) => {
-            stream.pipe(decodeBuildkit);
-            stream.on('close', () => resolve());
-            stream.on('error', (error) => reject(error));
+            this.context.docker.modem.followProgress(stream, (err, _traces) => {
+                return err ? reject(err) : resolve();
+            }, async (trace) => {
+                if (trace.error) {
+                    logFile.write(trace.error + '\n');
+                    this.out?.write(trace.error + '\n');
+                    reject(trace.error);
+                }
+                else {
+                    try {
+                        const { vertexes } = await decodeBuildkitStatusResponse(trace.aux);
+                        vertexes.forEach((v) => {
+                            // logStream.write(JSON.stringify(v) + '\n');
+                            logFile.write(v.name + '\n');
+                            this.out?.write(v.name + '\n');
+                        });
+                    }
+                    catch (error) {
+                        console.error(error);
+                    }
+                }
+            });
         });
     }
 }

package/dist/src/errors.d.ts

@@ -72,6 +72,11 @@ export declare class MultipleContainersFoundError extends EMBError {
     component: string;
     constructor(msg: string, component: string);
 }
+export declare class CommandExecError extends EMBError {
+    exitCode: number;
+    signal?: (NodeJS.Signals | null) | undefined;
+    constructor(msg: string, exitCode: number, signal?: (NodeJS.Signals | null) | undefined);
+}
 export declare class ComposeExecError extends EMBError {
     exitCode: number;
     signal?: (NodeJS.Signals | null) | undefined;

package/dist/src/errors.js

@@ -95,6 +95,15 @@ export class MultipleContainersFoundError extends EMBError {
         this.component = component;
     }
 }
+export class CommandExecError extends EMBError {
+    exitCode;
+    signal;
+    constructor(msg, exitCode, signal) {
+        super('COMMAND_EXEC_ERR', msg);
+        this.exitCode = exitCode;
+        this.signal = signal;
+    }
+}
 export class ComposeExecError extends EMBError {
     exitCode;
     signal;

package/dist/src/monorepo/operations/resources/BuildResourcesOperation.js

@@ -105,6 +105,7 @@ export class BuildResourcesOperation extends AbstractOperation {
                 },
             },
             {
+                rendererOptions: { persistentOutput: true },
                 title: `Build ${resource.id}`,
                 task: async (ctx, task) => {
                     const skip = (prefix) => {

package/dist/src/monorepo/operations/shell/ExecuteLocalCommandOperation.d.ts

@@ -10,8 +10,8 @@ declare const schema: z.ZodObject<{
     workingDir: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare class ExecuteLocalCommandOperation extends AbstractOperation<typeof schema, Readable> {
-    protected out: Writable;
-    constructor(out: Writable);
+    protected out?: Writable | undefined;
+    constructor(out?: Writable | undefined);
     protected _run(input: z.input<typeof schema>): Promise<Readable>;
 }
 export {};

package/dist/src/monorepo/operations/shell/ExecuteLocalCommandOperation.js

@@ -27,7 +27,9 @@ export class ExecuteLocalCommandOperation extends AbstractOperation {
             cwd: input.workingDir,
             shell: true,
         });
-        process.all.pipe(this.out);
+        if (this.out) {
+            process.all.pipe(this.out);
+        }
         return process.all;
     }
 }

package/dist/src/monorepo/operations/tasks/RunTasksOperation.js

@@ -29,7 +29,6 @@ export class RunTasksOperation {
                     if (!task.script) {
                         return;
                     }
-                    console.log('YES WE DO', task.component);
                     const executor = params.executor ??
                         (task.component ? ExecutorType.container : ExecutorType.local);
                     if (executor === ExecutorType.container && !task.component) {

package/oclif.manifest.json

@@ -268,10 +268,12 @@
         "shell.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Print the current config.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -283,21 +285,22 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
+        "all": {
+          "char": "a",
+          "description": "Retun all containers. By default, only running containers are shown",
+          "name": "all",
           "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "config:print",
+      "id": "containers",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
+      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -305,16 +308,14 @@
         "src",
         "cli",
         "commands",
-        "config",
-        "print.js"
+        "containers",
+        "index.js"
       ]
     },
-    "containers": {
-      "aliases": [
-        "ps"
-      ],
+    "containers:prune": {
+      "aliases": [],
       "args": {},
-      "description": "List docker containers.",
+      "description": "Prune containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -325,19 +326,11 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "all": {
-          "char": "a",
-          "description": "Retun all containers. By default, only running containers are shown",
-          "name": "all",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers",
+      "id": "containers:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -350,13 +343,13 @@
         "cli",
         "commands",
         "containers",
-        "index.js"
+        "prune.js"
       ]
     },
-    "containers:prune": {
+    "config:print": {
       "aliases": [],
       "args": {},
-      "description": "Prune containers.",
+      "description": "Print the current config.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -367,15 +360,22 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers:prune",
+      "id": "config:print",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
-      "strict": true,
       "enableJsonFlag": true,
       "isESM": true,
       "relativePath": [
@@ -383,8 +383,8 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "prune.js"
+        "config",
+        "print.js"
       ]
     },
     "images:delete": {
@@ -718,5 +718,5 @@
       ]
     }
   },
-  "version": "0.4.1"
+  "version": "0.4.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "keywords": [
     "monorepo",
     "docker",