@aifabrix/builder 2.33.3 → 2.33.4

package/lib/utils/env-map.js

@@ -233,11 +233,15 @@ function applyLocalPortAdjustment(result, devIdNum) {
 
 /**
  * Calculate public ports for docker context
+ * Uses base ports from env-config when available so *_PUBLIC_PORT is always base + devId*100
+ * (e.g. KEYCLOAK_PUBLIC_PORT = 8082 + 600 = 8682 for dev 6, not 8080 + 600 from overrides)
+ *
  * @function calculateDockerPublicPorts
- * @param {Object} result - Environment variable map
+ * @param {Object} result - Environment variable map (merged base + overrides)
  * @param {number} devIdNum - Developer ID number
+ * @param {Object} [baseVars] - Base vars from env-config (used for *_PUBLIC_PORT calculation when present)
  */
-function calculateDockerPublicPorts(result, devIdNum) {
+function calculateDockerPublicPorts(result, devIdNum, baseVars = {}) {
   if (devIdNum <= 0) {
     return;
   }
@@ -245,13 +249,14 @@ function calculateDockerPublicPorts(result, devIdNum) {
     // Match any variable ending with _PORT (e.g., MISO_PORT, KEYCLOAK_PORT, DB_PORT)
     if (/_PORT$/.test(key) && !/_PUBLIC_PORT$/.test(key)) {
       const publicPortKey = key.replace(/_PORT$/, '_PUBLIC_PORT');
-      // Always recalculate public port based on base port, even if manually set
-      // This ensures developer-id offset is always applied correctly
+      // Use base port from env-config when available so PUBLIC_PORT is canonical (e.g. 8082 not 8080)
+      const basePort = baseVars[key];
+      const sourceVal = basePort !== undefined && basePort !== null ? basePort : value;
       let portVal;
-      if (typeof value === 'string') {
-        portVal = parseInt(value, 10);
-      } else if (typeof value === 'number') {
-        portVal = value;
+      if (typeof sourceVal === 'string') {
+        portVal = parseInt(sourceVal, 10);
+      } else if (typeof sourceVal === 'number') {
+        portVal = sourceVal;
       } else {
         continue;
       }
@@ -289,7 +294,7 @@ async function buildEnvVarMap(context, osModule = null, developerId = null) {
     applyLocalPortAdjustment(result, devIdNum);
   } else if (context === 'docker') {
     const devIdNum = await getDeveloperIdNumber(developerId);
-    calculateDockerPublicPorts(result, devIdNum);
+    calculateDockerPublicPorts(result, devIdNum, baseVars);
   }
 
   return result;

package/package.json

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