@aifabrix/builder 2.3.2 → 2.3.3

package/lib/app-run-helpers.js

@@ -24,6 +24,7 @@ const buildCopy = require('./utils/build-copy');
 const logger = require('./utils/logger');
 const { waitForHealthCheck } = require('./utils/health-check');
 const composeGenerator = require('./utils/compose-generator');
+const dockerUtils = require('./utils/docker');
 
 const execAsync = promisify(exec);
 
@@ -308,6 +309,9 @@ async function prepareEnvironment(appName, appConfig, options) {
 async function startContainer(appName, composePath, port, appConfig = null, debug = false) {
   logger.log(chalk.blue(`Starting ${appName}...`));
 
+  // Ensure Docker + Compose available and determine correct compose command
+  const composeCmdBase = await dockerUtils.ensureDockerAndCompose().then(() => dockerUtils.getComposeCommand());
+
   const adminSecretsPath = await infra.ensureAdminSecrets();
   if (debug) {
     logger.log(chalk.gray(`[DEBUG] Admin secrets path: ${adminSecretsPath}`));
@@ -327,7 +331,7 @@ async function startContainer(appName, composePath, port, appConfig = null, debu
     logger.log(chalk.gray(`[DEBUG] Environment variables: ADMIN_SECRETS_PATH=${adminSecretsPath}, POSTGRES_PASSWORD=${postgresPassword ? '***' : '(not set)'}`));
   }
 
-  const composeCmd = `docker-compose -f "${composePath}" up -d`;
+  const composeCmd = `${composeCmdBase} -f "${composePath}" up -d`;
   if (debug) {
     logger.log(chalk.gray(`[DEBUG] Executing: ${composeCmd}`));
     logger.log(chalk.gray(`[DEBUG] Compose file: ${composePath}`));

package/lib/infra.js

@@ -20,6 +20,7 @@ const config = require('./config');
 const devConfig = require('./utils/dev-config');
 const logger = require('./utils/logger');
 const containerUtils = require('./utils/infra-containers');
+const dockerUtils = require('./utils/docker');
 
 // Register Handlebars helper for equality check
 handlebars.registerHelper('eq', (a, b) => a === b);
@@ -76,8 +77,7 @@ function execAsyncWithCwd(command, options = {}) {
  */
 async function checkDockerAvailability() {
   try {
-    await execAsync('docker --version');
-    await execAsync('docker-compose --version');
+    await dockerUtils.ensureDockerAndCompose();
   } catch (error) {
     throw new Error('Docker or Docker Compose is not available. Please install and start Docker.');
   }
@@ -138,7 +138,8 @@ async function startInfra(developerId = null) {
     logger.log(`Using compose file: ${composePath}`);
     logger.log(`Starting infrastructure services for developer ${devId}...`);
     const projectName = getInfraProjectName(devId);
-    await execAsyncWithCwd(`docker-compose -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" up -d`, { cwd: infraDir });
+    const composeCmd = await dockerUtils.getComposeCommand();
+    await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" up -d`, { cwd: infraDir });
     logger.log('Infrastructure services started successfully');
 
     await waitForServices(devId);
@@ -177,7 +178,8 @@ async function stopInfra() {
   try {
     logger.log('Stopping infrastructure services...');
     const projectName = getInfraProjectName(devId);
-    await execAsyncWithCwd(`docker-compose -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" down`, { cwd: infraDir });
+    const composeCmd = await dockerUtils.getComposeCommand();
+    await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" down`, { cwd: infraDir });
     logger.log('Infrastructure services stopped');
   } finally {
     // Keep the compose file for future use
@@ -213,7 +215,8 @@ async function stopInfraWithVolumes() {
   try {
     logger.log('Stopping infrastructure services and removing all data...');
     const projectName = getInfraProjectName(devId);
-    await execAsyncWithCwd(`docker-compose -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" down -v`, { cwd: infraDir });
+    const composeCmd = await dockerUtils.getComposeCommand();
+    await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" down -v`, { cwd: infraDir });
     logger.log('Infrastructure services stopped and all data removed');
   } finally {
     // Keep the compose file for future use
@@ -347,7 +350,8 @@ async function restartService(serviceName) {
   try {
     logger.log(`Restarting ${serviceName} service...`);
     const projectName = getInfraProjectName(devId);
-    await execAsyncWithCwd(`docker-compose -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" restart ${serviceName}`, { cwd: infraDir });
+    const composeCmd = await dockerUtils.getComposeCommand();
+    await execAsyncWithCwd(`${composeCmd} -f "${composePath}" -p ${projectName} --env-file "${adminSecretsPath}" restart ${serviceName}`, { cwd: infraDir });
     logger.log(`${serviceName} service restarted successfully`);
   } finally {
     // Keep the compose file for future use

package/lib/utils/docker.js

@@ -0,0 +1,73 @@
+/**
+ * Docker CLI Utilities
+ *
+ * Detects availability of Docker and determines the correct Docker Compose command
+ * across environments (Compose v2 plugin: "docker compose", Compose v1: "docker-compose").
+ *
+ * @fileoverview Docker/Compose detection helpers for AI Fabrix Builder
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+'use strict';
+
+const { exec } = require('child_process');
+const { promisify } = require('util');
+
+const execAsync = promisify(exec);
+
+/**
+ * Checks that Docker CLI is available.
+ * @async
+ * @function checkDockerCli
+ * @returns {Promise<void>} Resolves if docker is available
+ * @throws {Error} If docker is unavailable
+ */
+async function checkDockerCli() {
+  await execAsync('docker --version');
+}
+
+/**
+ * Determines the correct Docker Compose command on this system.
+ * Tries Docker Compose v2 plugin first: "docker compose", then falls back to v1: "docker-compose".
+ *
+ * @async
+ * @function getComposeCommand
+ * @returns {Promise<string>} The compose command to use ("docker compose" or "docker-compose")
+ * @throws {Error} If neither v2 nor v1 is available
+ */
+async function getComposeCommand() {
+  // Prefer Compose v2 plugin if present
+  try {
+    await execAsync('docker compose version');
+    return 'docker compose';
+  } catch (_) {
+    // Fall back to legacy docker-compose
+  }
+
+  try {
+    await execAsync('docker-compose --version');
+    return 'docker-compose';
+  } catch (_) {
+    throw new Error('Docker Compose is not available (neither "docker compose" nor "docker-compose" found).');
+  }
+}
+
+/**
+ * Ensures Docker and Docker Compose are available, returning the compose command to use.
+ * @async
+ * @function ensureDockerAndCompose
+ * @returns {Promise<string>} The compose command to use
+ * @throws {Error} If docker or compose is not available
+ */
+async function ensureDockerAndCompose() {
+  await checkDockerCli();
+  return await getComposeCommand();
+}
+
+module.exports = {
+  checkDockerCli,
+  getComposeCommand,
+  ensureDockerAndCompose
+};
+

package/lib/utils/environment-checker.js

@@ -12,6 +12,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const dockerUtils = require('./docker');
 
 /**
  * Checks if Docker is installed and available
@@ -22,12 +23,8 @@ const os = require('os');
  */
 async function checkDocker() {
   try {
-    const { exec } = require('child_process');
-    const { promisify } = require('util');
-    const execAsync = promisify(exec);
-
-    await execAsync('docker --version');
-    await execAsync('docker-compose --version');
+    await dockerUtils.checkDockerCli();
+    await dockerUtils.getComposeCommand();
     return 'ok';
   } catch (error) {
     return 'error';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {