@aifabrix/builder 2.0.6 → 2.0.8

package/lib/app-run.js

@@ -281,11 +281,11 @@ async function startContainer(appName, composePath, port, config = null) {
   await execAsync(`docker-compose -f "${composePath}" up -d`, { env });
   logger.log(chalk.green(`✓ Container aifabrix-${appName} started`));
 
-  // Wait for health check - detect actual mapped port from Docker
-  // Don't pass port so waitForHealthCheck will auto-detect it from container
+  // Wait for health check using host port
+  // Port is the host port (CLI --port or config.port, NOT localPort)
   const healthCheckPath = config?.healthCheck?.path || '/health';
   logger.log(chalk.blue(`Waiting for application to be healthy at http://localhost:${port}${healthCheckPath}...`));
-  await waitForHealthCheck(appName, 90, null, config);
+  await waitForHealthCheck(appName, 90, port, config);
 }
 
 /**
@@ -343,7 +343,8 @@ async function runApp(appName, options = {}) {
     }
 
     // Check port availability
-    const port = options.port || config.build?.localPort || config.port || 3000;
+    // Host port: CLI --port if provided, otherwise port from variables.yaml (NOT localPort)
+    const port = options.port || config.port || 3000;
     const portAvailable = await checkPortAvailable(port);
     if (!portAvailable) {
       throw new Error(`Port ${port} is already in use. Try --port <alternative>`);

package/lib/secrets.js

@@ -173,6 +173,8 @@ function loadEnvTemplate(templatePath) {
 
 /**
  * Processes environment variables and copies to output path if needed
+ * Updates PORT variable to use localPort if available (only when copying to envOutputPath)
+ * When .env stays in builder folder, uses port (container port)
  * @function processEnvVariables
  * @param {string} envPath - Path to generated .env file
  * @param {string} variablesPath - Path to variables.yaml
@@ -204,7 +206,18 @@ function processEnvVariables(envPath, variablesPath) {
     fs.mkdirSync(outputDir, { recursive: true });
   }
 
-  fs.copyFileSync(envPath, outputPath);
+  // Read the .env file content
+  let envContent = fs.readFileSync(envPath, 'utf8');
+
+  // Update PORT variable: use localPort ONLY when copying to envOutputPath (outside builder folder)
+  // When .env stays in builder folder, it uses port (container port)
+  const portToUse = variables.build?.localPort || variables.port || 3000;
+
+  // Replace PORT line (handles PORT=value format, with or without spaces)
+  envContent = envContent.replace(/^PORT\s*=\s*.*$/m, `PORT=${portToUse}`);
+
+  // Write updated content to output path
+  fs.writeFileSync(outputPath, envContent, { mode: 0o600 });
   logger.log(chalk.green(`✓ Copied .env to: ${variables.build.envOutputPath}`));
 }
 
@@ -244,6 +257,22 @@ async function generateEnvFile(appName, secretsPath, environment = 'local', forc
   const resolved = await resolveKvReferences(template, secrets, environment, resolvedSecretsPath);
 
   fs.writeFileSync(envPath, resolved, { mode: 0o600 });
+
+  // Update PORT variable in container .env file to use port (from variables.yaml)
+  // Note: containerPort is ONLY used for Docker Compose port mapping, NOT for PORT env variable
+  // The application inside container listens on PORT env variable, which should be 'port' from variables.yaml
+  if (fs.existsSync(variablesPath)) {
+    const variablesContent = fs.readFileSync(variablesPath, 'utf8');
+    const variables = yaml.load(variablesContent);
+    const port = variables.port || 3000;
+
+    // Update PORT in container .env file to use port (NOT containerPort, NOT localPort)
+    let envContent = fs.readFileSync(envPath, 'utf8');
+    envContent = envContent.replace(/^PORT\s*=\s*.*$/m, `PORT=${port}`);
+    fs.writeFileSync(envPath, envContent, { mode: 0o600 });
+  }
+
+  // Process and copy to envOutputPath if configured (uses localPort for copied file)
   processEnvVariables(envPath, variablesPath);
 
   return envPath;

package/lib/utils/compose-generator.js

@@ -110,20 +110,18 @@ function buildServiceConfig(appName, config, port) {
   // Container port: build.containerPort > config.port
   const containerPortValue = config.build?.containerPort || config.port || port;
 
-  // Host port logic:
-  // - If containerPort is specified: use options.port or build.localPort
-  // - If containerPort is NOT specified: use options.port if provided, otherwise config.port (same as container port)
-  const hostPort = config.build?.containerPort
-    ? (port || config.build?.localPort || config.port || 3000)  // If containerPort exists, use options.port or localPort
-    : (port !== config.port ? port : config.port || port);  // If no containerPort, use options.port if different, else config.port
+  // Host port: use port parameter (already calculated from CLI --port or config.port in generateDockerCompose)
+  // Note: build.localPort is ONLY used for .env file PORT variable (for local PC dev), NOT for Docker Compose
+  const hostPort = port;
 
   return {
     app: buildAppConfig(appName, config),
     image: buildImageConfig(config, appName),
     port: containerPortValue, // Container port (for health check and template)
-    containerPort: config.build?.containerPort || null, // Explicit containerPort if specified, null otherwise
+    containerPort: containerPortValue, // Container port (always set, equals containerPort if exists, else port)
+    hostPort: hostPort, // Host port (options.port if provided, else config.port)
     build: {
-      localPort: hostPort // Host port
+      localPort: config.build?.localPort || null // Only used for .env file PORT variable, not for Docker Compose
     },
     healthCheck: buildHealthCheckConfig(config),
     ...buildRequiresConfig(config)
@@ -167,8 +165,9 @@ async function generateDockerCompose(appName, config, options) {
   const language = config.build?.language || config.language || 'typescript';
   const template = loadDockerComposeTemplate(language);
 
-  // Determine port: use options.port if provided, otherwise use config.port (ignore build.localPort when no containerPort)
-  const port = options.port || (config.build?.containerPort ? config.build?.localPort : null) || config.port || 3000;
+  // Use options.port if provided, otherwise use config.port
+  // (localPort will be handled in buildServiceConfig)
+  const port = options.port || config.port || 3000;
 
   const serviceConfig = buildServiceConfig(appName, config, port);
   const volumesConfig = buildVolumesConfig(appName);

package/package.json

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

package/templates/python/docker-compose.hbs

@@ -9,11 +9,7 @@ services:
     env_file:
       - {{envFile}}
     ports:
-      {{#if containerPort}}
-      - "{{build.localPort}}:{{containerPort}}"
-      {{else}}
-      - "{{build.localPort}}:{{port}}"
-      {{/if}}
+      - "{{hostPort}}:{{containerPort}}"
     networks:
       - infra_aifabrix-network
     {{#if requiresStorage}}

package/templates/typescript/docker-compose.hbs

@@ -9,11 +9,7 @@ services:
     env_file:
       - {{envFile}}
     ports:
-      {{#if containerPort}}
-      - "{{build.localPort}}:{{containerPort}}"
-      {{else}}
-      - "{{build.localPort}}:{{port}}"
-      {{/if}}
+      - "{{hostPort}}:{{containerPort}}"
     networks:
       - infra_aifabrix-network
     {{#if requiresStorage}}