@aifabrix/builder 2.3.3 → 2.3.5

package/lib/infra.js

@@ -123,7 +123,7 @@ async function startInfra(developerId = null) {
   // Dev 0: infra-aifabrix-network, Dev > 0: infra-dev{id}-aifabrix-network
   const networkName = idNum === 0 ? 'infra-aifabrix-network' : `infra-dev${devId}-aifabrix-network`;
   const composeContent = template({
-    devId: devId,
+    devId: idNum,
     postgresPort: ports.postgres,
     redisPort: ports.redis,
     pgadminPort: ports.pgadmin,

package/lib/secrets.js

@@ -438,7 +438,7 @@ async function generateAdminSecretsEnv(secretsPath) {
 POSTGRES_PASSWORD=${postgresPassword}
 PGADMIN_DEFAULT_EMAIL=admin@aifabrix.ai
 PGADMIN_DEFAULT_PASSWORD=${postgresPassword}
-REDIS_HOST=local:localhost:6379
+REDIS_HOST=local:redis:6379
 REDIS_COMMANDER_USER=admin
 REDIS_COMMANDER_PASSWORD=${postgresPassword}
 `;

package/lib/utils/compose-generator.js

@@ -16,6 +16,9 @@ const handlebars = require('handlebars');
 const config = require('../config');
 const buildCopy = require('./build-copy');
 
+// Register commonly used helpers
+handlebars.registerHelper('eq', (a, b) => a === b);
+
 // Register Handlebars helper for quoting PostgreSQL identifiers
 // PostgreSQL requires identifiers with hyphens or special characters to be quoted
 handlebars.registerHelper('pgQuote', (identifier) => {

package/lib/utils/infra-containers.js

@@ -28,21 +28,32 @@ async function findContainer(serviceName, devId = null) {
     const developerId = devId || await config.getDeveloperId();
     const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
     // Dev 0: aifabrix-{serviceName}, Dev > 0: aifabrix-dev{id}-{serviceName}
-    const containerNamePattern = idNum === 0
-      ? `aifabrix-${serviceName}`
-      : `aifabrix-dev${developerId}-${serviceName}`;
-    let { stdout } = await execAsync(`docker ps --filter "name=${containerNamePattern}" --format "{{.Names}}"`);
-    let containerName = stdout.trim();
-    if (!containerName) {
-      // Fallback to old naming patterns for backward compatibility
-      ({ stdout } = await execAsync(`docker ps --filter "name=infra-${serviceName}" --format "{{.Names}}"`));
-      containerName = stdout.trim();
-      if (!containerName) {
-        ({ stdout } = await execAsync(`docker ps --filter "name=aifabrix-${serviceName}" --format "{{.Names}}"`));
-        containerName = stdout.trim();
+    const primaryPattern = idNum === 0 ? `aifabrix-${serviceName}` : `aifabrix-dev${developerId}-${serviceName}`;
+
+    // Search order expected by tests:
+    // 1) primaryPattern
+    // 2) infra-{serviceName} (old pattern)
+    // 3) aifabrix-{serviceName} (base pattern)
+    const patternsToTry = [
+      primaryPattern,
+      `infra-${serviceName}`,
+      `aifabrix-${serviceName}`
+    ];
+
+    for (const pattern of patternsToTry) {
+      const { stdout } = await execAsync(`docker ps --filter "name=${pattern}" --format "{{.Names}}"`);
+      const names = stdout
+        .split('\n')
+        .map(s => s.trim())
+        .filter(s => s.length > 0);
+      const exactMatch = names.find(n => n === pattern);
+      if (exactMatch || names[0]) {
+        return exactMatch || names[0];
       }
     }
-    return containerName;
+
+    // Not found with any pattern
+    return '';
   } catch (error) {
     return null;
   }

package/package.json

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

package/templates/infra/compose.yaml.hbs

@@ -82,8 +82,10 @@ services:
 
 volumes:
   dev{{devId}}_postgres_data:
+    name: {{#if (eq devId 0)}}infra_postgres_data{{else}}infra_dev{{devId}}_postgres_data{{/if}}
     driver: local
   dev{{devId}}_redis_data:
+    name: {{#if (eq devId 0)}}infra_redis_data{{else}}infra_dev{{devId}}_redis_data{{/if}}
     driver: local
 
 networks:

package/templates/python/docker-compose.hbs

@@ -14,7 +14,7 @@ services:
       - {{networkName}}
     {{#if requiresStorage}}
     volumes:
-      - "{{mountVolume}}:/mnt/data"
+      - {{#if (eq devId 0)}}aifabrix_{{app.key}}_data{{else}}aifabrix_dev{{devId}}_{{app.key}}_data{{/if}}:/mnt/data
     {{/if}}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:{{port}}{{healthCheck.path}}"]
@@ -98,6 +98,19 @@ services:
     restart: "no"
   {{/if}}
 
+{{#if requiresStorage}}
+volumes:
+  {{#if (eq devId 0)}}
+  aifabrix_{{app.key}}_data:
+    name: aifabrix_{{app.key}}_data
+    driver: local
+  {{else}}
+  aifabrix_dev{{devId}}_{{app.key}}_data:
+    name: aifabrix_dev{{devId}}_{{app.key}}_data
+    driver: local
+  {{/if}}
+{{/if}}
+
 networks:
   {{networkName}}:
     external: true

package/templates/typescript/docker-compose.hbs

@@ -14,7 +14,7 @@ services:
       - {{networkName}}
     {{#if requiresStorage}}
     volumes:
-      - "{{mountVolume}}:/mnt/data"
+      - {{#if (eq devId 0)}}aifabrix_{{app.key}}_data{{else}}aifabrix_dev{{devId}}_{{app.key}}_data{{/if}}:/mnt/data
     {{/if}}
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:{{port}}{{healthCheck.path}}"]
@@ -98,6 +98,19 @@ services:
     restart: "no"
   {{/if}}
 
+{{#if requiresStorage}}
+volumes:
+  {{#if (eq devId 0)}}
+  aifabrix_{{app.key}}_data:
+    name: aifabrix_{{app.key}}_data
+    driver: local
+  {{else}}
+  aifabrix_dev{{devId}}_{{app.key}}_data:
+    name: aifabrix_dev{{devId}}_{{app.key}}_data
+    driver: local
+  {{/if}}
+{{/if}}
+
 networks:
   {{networkName}}:
     external: true