@aifabrix/builder 2.0.4 → 2.0.6

package/README.md

@@ -2,6 +2,7 @@
 
 [![npm version](https://img.shields.io/npm/v/@aifabrix/builder.svg)](https://www.npmjs.com/package/@aifabrix/builder)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
 Local development infrastructure + Azure deployment tool.
 
 ## Install

package/lib/utils/compose-generator.js

@@ -107,14 +107,23 @@ function buildRequiresConfig(config) {
  * @returns {Object} Service configuration
  */
 function buildServiceConfig(appName, config, port) {
-  const containerPort = config.build?.containerPort || config.port || 3000;
+  // 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
 
   return {
     app: buildAppConfig(appName, config),
     image: buildImageConfig(config, appName),
-    port: containerPort,
+    port: containerPortValue, // Container port (for health check and template)
+    containerPort: config.build?.containerPort || null, // Explicit containerPort if specified, null otherwise
     build: {
-      localPort: port
+      localPort: hostPort // Host port
     },
     healthCheck: buildHealthCheckConfig(config),
     ...buildRequiresConfig(config)
@@ -158,7 +167,8 @@ async function generateDockerCompose(appName, config, options) {
   const language = config.build?.language || config.language || 'typescript';
   const template = loadDockerComposeTemplate(language);
 
-  const port = options.port || config.build?.localPort || config.port || 3000;
+  // 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;
 
   const serviceConfig = buildServiceConfig(appName, config, port);
   const volumesConfig = buildVolumesConfig(appName);

package/package.json

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

package/templates/python/docker-compose.hbs

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

package/templates/typescript/docker-compose.hbs

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