@gnar-engine/cli 1.0.7 → 1.0.8

package/bootstrap/services/control/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/control/package*.json ./
+COPY ./package*.json ./
 
 # Install nodemon
 RUN npm install -g nodemon
@@ -18,6 +18,3 @@ RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]

package/bootstrap/services/notification/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/notification/package*.json ./
+COPY ./package*.json ./
 
 # Install nodemon
 RUN npm install -g nodemon
@@ -18,6 +18,3 @@ RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]

package/bootstrap/services/page/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/page/package*.json ./
+COPY ./package*.json ./
 
 # Install nodemon
 RUN npm install -g nodemon
@@ -18,6 +18,3 @@ RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]

package/bootstrap/services/portal/Dockerfile

@@ -8,13 +8,10 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/portal/ ./
+COPY ./ ./
 
 # Install app dependencies
 RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 5173
-
-# Start the application
-CMD ["npm", "run", "start:dev"]

package/bootstrap/services/user/Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/user/package*.json ./
+COPY ./package*.json ./
 
 # Install nodemon
 RUN npm install -g nodemon
@@ -18,6 +18,3 @@ RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gnar-engine/cli",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "description": "Gnar Engine Development Framework CLI: Project bootstrap, scaffolder & control plane.",
     "type": "module",
     "bin": {
@@ -30,6 +30,7 @@
         "handlebars": "^4.7.8",
         "inquirer": "^12.5.2",
         "js-yaml": "^4.1.0",
+        "tar-fs": "^3.1.1",
         "uuid": "^11.1.0"
     }
 }

package/src/config.js

@@ -3,14 +3,14 @@ import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+
 export const gnarEngineCliConfig = {
 
-    /**
-     * The path the Gnar Engine service core should be found in the service containers
-     */
+    // The path the Gnar Engine service core should be found in the service containers
     corePath: '/usr/gnar_engine/app/node_modules/@gnar-engine/core',
-    coreDevPath: path.join(__dirname, '../../core'),
 
+    // The path to the core source code on the host machine (core dev mode)
+    coreDevPath: path.join(__dirname, '../../core'),
 }
 
 export const directories = {

package/src/dev/commands.js

@@ -13,8 +13,10 @@ export function registerDevCommands(program) {
 		.option('-b, --build', 'Build without cache')
         .option('-d, --detach', 'Run containers in background')
         .option('-a, --attach-all', 'Attach all services including database and message queues for debugging')
-        .option('-t --test', 'Run the tests with ephemeral databases')
+        .option('-t --test', 'Run all tests with ephemeral databases *NOT IMPLEMENTED')
         .option('--test-service <service>', 'Run the tests for the specified service with ephemeral databases (e.g. --test-service user)')
+        .option('-reset-databases, --reset-databases', 'Drop all service databases, re-running all migrations and seeders *NOT IMPLEMENTED')
+        .option('--reset-database <service>', 'Drop the specified service database, re-running all migrations and seeders (e.g. --reset-database user)')
         .addOption(new Option('--core-dev').hideHelp())
         .addOption(new Option('--bootstrap-dev').hideHelp())
         .action(async (options) => {
@@ -44,6 +46,8 @@ export function registerDevCommands(program) {
                     bootstrapDev: options.bootstrapDev || false,
                     test: options.test || false,
                     testService: options.testService || '',
+                    resetDatabases: options.resetDatabases || false,
+                    resetDatabase: options.resetDatabase || '',
                     attachAll: options.attachAll || false
                  });
 			} catch (err) {

package/src/dev/dev.service.js

@@ -8,9 +8,11 @@ import yaml from "js-yaml";
 import { gnarEngineCliConfig } from "../config.js";
 import { buildImage, createContainer, createBridgeNetwork } from "../services/docker.js";
 import { directories } from "../config.js";
-
+import { exec } from 'child_process';
+import { promisify } from 'util';
 
 const docker = new Docker();
+const execAsync = promisify(exec);
 
 /**
  * Start the application locally
@@ -25,11 +27,25 @@ const docker = new Docker();
  * @param {boolean} [options.bootstrapDev=false] - Whether to set the cli/src/bootstrap directory as the project directory
  * @param {boolean} [options.test=false] - Whether to run tests with ephemeral databases
  * @param {string} [options.testService=''] - The service to run tests for (only applicable if test=true)
+ * @param {boolean} [options.resetDatabases=false] - Whether to drop all service databases, re-running all migrations and seeders
+ * @param {string} [options.resetDatabase=''] - The service database to drop, re-running all migrations and seeders
  * @param {boolean} [options.removeOrphans=true] - Whether to remove orphaned containers
  * @param {boolean} [options.attachAll=false] - Attach all services including database and message queues for debugging
  */
-export async function up({ projectDir, build = false, detach = false, coreDev = false, bootstrapDev = false, test = false, testService = '', removeOrphans = true, attachAll = false}) {
-    
+export async function up({ 
+        projectDir,
+        build = false,
+        detach = false, 
+        coreDev = false, 
+        bootstrapDev = false, 
+        test = false, 
+        testService = '', 
+        resetDatabases = false,
+        resetDatabase = '',
+        removeOrphans = true, 
+        attachAll = false
+    }) {
+
     // bootstrap dev
     if (bootstrapDev) {
         const fileDir = path.dirname(new URL(import.meta.url).pathname);
@@ -59,7 +75,7 @@ export async function up({ projectDir, build = false, detach = false, coreDev =
     });
     await fs.writeFile(nginxConfPath, nginxConf);
 
-    // create docker-compose.yml dynamically from parsed config and secrets
+    // create and up containers
     const dockerComposePath = path.join(gnarHiddenDir, "docker-compose.dev.yml");
     const dockerCompose = await buildAndUpContainers({
         config: parsedConfig.config,
@@ -70,42 +86,11 @@ export async function up({ projectDir, build = false, detach = false, coreDev =
         bootstrapDev: bootstrapDev,
         test: test,
         testService: testService,
-        attachAll: attachAll
+        resetDatabases: resetDatabases,
+        resetDatabase: resetDatabase,
+        attachAll: attachAll,
+        build: build,
     });
-
-    // // up docker-compose
-    // const args = ["-f", dockerComposePath, "up"];
-    //
-    // if (build) {
-    //     args.push("--build");
-    // }
-    //
-    // if (detach) {
-    //     args.push("-d");
-    // }
-    //
-    // if (removeOrphans) {
-    //     args.push("--remove-orphans")
-    // }
-
-    // const processRef = spawn(
-    //     "docker-compose",
-    //     args,
-    //     {
-    //         cwd: projectDir,
-    //         stdio: "inherit",
-    //         shell: "/bin/sh"
-    //     }
-    // );
-    //
-    // // handle exit
-    // const exitCode = await new Promise((resolve) => {
-    //     processRef.on("close", resolve);
-    // });
-    //
-    // if (exitCode !== 0) {
-    //     throw new Error(`docker-compose up exited with code ${exitCode}`);
-    // }
 }
 
 /**
@@ -144,6 +129,15 @@ export async function down({ projectDir, allContainers = false }) {
         })
     );
 
+    // // remove bound mounts
+    // await Promise.all(
+    //     containers.map(async c => {
+    //         const container = docker.getContainer(c.Id);
+    //         const containerInfo = await container.inspect();
+    //         await removeBindMounts({ containerInfo: containerInfo });
+    //     })
+    // );
+
     // remove each container
     await Promise.all(
         containers.map(c => {
@@ -157,6 +151,26 @@ export async function down({ projectDir, allContainers = false }) {
     console.log('Containers stopped and removed.');
 }
 
+/**
+ * Remove bind mounts
+ *
+ * @param {object} containerInfo
+ */
+export async function removeBindMounts({containerInfo}) {
+
+    const binds = containerInfo.HostConfig.Binds || [];
+
+    for (const bind of binds) {
+        const hostPath = bind.split(':')[0];
+        try {
+            await execAsync(`sudo umount ${hostPath}`);
+            console.log(`Unmounted ${hostPath}`);
+        } catch (err) {
+            console.warn(`Failed to unmount ${hostPath}: ${err.message}`);
+        }
+    }
+}
+
 /**
  * Create dynamic nginx.conf file for running application locally
  * 
@@ -236,9 +250,24 @@ export async function createDynamicNginxConf({ config, serviceConfDir, projectDi
  * @param {boolean} build - Whether to re-build images
  * @param {boolean} test - Whether to run tests with ephemeral databases
  * @param {string} testService - The service to run tests for (only applicable if test=true)
+ * @param {boolean} resetDatabases - Whether to drop all service databases, re-running all migrations and seeders
+ * @
  * @param {boolean} attachAll - Whether to attach to all containers' stdio (otherwise databases and message queue are detached)
  */
-async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir, coreDev = false, bootstrapDev = false, build = false, test = false, testService, attachAll = false }) {
+async function buildAndUpContainers({ 
+        config, 
+        secrets, 
+        gnarHiddenDir, 
+        projectDir, 
+        coreDev = false, 
+        bootstrapDev = false, 
+        build = false, 
+        test = false, 
+        testService, 
+        resetDatabases = false,
+        resetDatabase = '',
+        attachAll = false 
+    }) {
     
     let mysqlPortsCounter = 3306;
     let mongoPortsCounter = 27017;
@@ -248,9 +277,10 @@ async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir
 
     console.log('========   g n a r   e n g i n e   ========');
     console.log('⛏️  Starting development environment...');
-    
-    // test mode env var adjustments
+
+    // env var adjustments
     for (const svc of config.services) {
+        // Tests
         if (test) {
             if (secrets.services?.[svc.name]?.MYSQL_HOST) {
                 secrets.services[svc.name].MYSQL_HOST = 'db-mysql-test';
@@ -264,6 +294,22 @@ async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir
                 }
             }
         }
+
+        // Reset all databases
+        if (resetDatabases) {
+            if (secrets.services?.[svc.name]) {
+                secrets.services[svc.name].RESET_DATABASE = true;
+            }
+        }
+
+        // Reset specific database
+        else if (resetDatabase) {
+            if (svc.name === resetDatabase) {
+                if (secrets.services?.[svc.name]) {
+                    secrets.services[svc.name].RESET_DATABASE = true;
+                }
+            }
+        }
     }
 
     // create bridge network
@@ -279,7 +325,8 @@ async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir
         await buildImage({
             context: directories.provisioner,
             dockerfile: 'Dockerfile',
-            imageTag: provisionerTag
+            imageTag: provisionerTag,
+            nocache: false
         });
     }
 
@@ -348,7 +395,8 @@ async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir
             await buildImage({
                 context: path.resolve(projectDir, 'services', svc.name),
                 dockerfile: 'Dockerfile',
-                imageTag: svcTag
+                imageTag: svcTag,
+                nocache: false
             });
         }
 
@@ -396,8 +444,8 @@ async function buildAndUpContainers({ config, secrets, gnarHiddenDir, projectDir
             env: env,
             ports: ports,
             binds: serviceVolumes,
-            restart: 'always',
-            attach: true,
+            restart: 'no',
+            attach: svc.detach ? !svc.detach : true,
             network: networkName,
             aliases: [`${svc.name}-service`]
         });

package/src/services/docker.js

@@ -1,6 +1,7 @@
 import Docker from 'dockerode';
 import { Writable } from 'stream';
 import path from 'path';
+import tar from 'tar-fs';
 import fs from 'fs';
 
 const docker = new Docker();
@@ -12,24 +13,38 @@ const docker = new Docker();
  * @param {string} options.context - The build context directory
  * @param {string} options.dockerfile - The Dockerfile path relative to the context
  * @param {string} options.imageTag - The tag to assign to the built image
+ * @param {boolean} [options.nocache=true] - Whether to build without cache
  */
-export async function buildImage({ context, dockerfile, imageTag }) {
+export async function buildImage({ context, dockerfile, imageTag, nocache = true }) {
 
     console.log('Building image...', imageTag);
 
-    const tarStream = await docker.buildImage(
-        {
-            context: context,
-            src: fs.readdirSync(context)
-        },
-        {
-            t: imageTag,
-            dockerfile
-        }
-    );
+    // Create a tar stream of the full context folder
+    const tarStream = tar.pack(context);
+
+    const stream = await docker.buildImage(tarStream, {
+        t: imageTag,
+        dockerfile,
+        nocache
+    });
 
     await new Promise((resolve, reject) => {
-        docker.modem.followProgress(tarStream, (err) => (err ? reject(err) : resolve()));
+        docker.modem.followProgress(
+            stream,
+            (err, res) => {
+                if (err) return reject(err);
+                resolve(res);
+            },
+            (event) => {
+                if (event.stream) process.stdout.write(event.stream);
+
+                // Catch BuildKit-style errors
+                if (event.error) return reject(new Error(event.error));
+                if (event.errorDetail && event.errorDetail.message) {
+                    return reject(new Error(event.errorDetail.message));
+                }
+            }
+        );
     });
 
     console.log('Built image:', imageTag);

package/templates/service/Dockerfile.hbs

@@ -8,7 +8,7 @@ WORKDIR /usr/gnar_engine/app
 ENV GLOBAL_SERVICE_BASE_DIR=/usr/gnar_engine/app/src/
 
 # Copy package.json and package-lock.json
-COPY ./services/{{serviceName}}/package*.json ./
+COPY ./package*.json ./
 
 # Install nodemon
 RUN npm install -g nodemon
@@ -18,6 +18,3 @@ RUN npm install
 
 # Expose the port the service will run on
 EXPOSE 3000
-
-# Start the application
-CMD ["nodemon", "--watch", "./gnar_engine", "./gnar_engine/app.js"]