@aifabrix/builder 2.0.0 → 2.0.2

package/templates/applications/keycloak/rbac.yaml

@@ -0,0 +1,37 @@
+roles:
+  - name: "AI Fabrix Admin"
+    value: "aifabrix-admin"
+    description: "Full access to all application features and configurations"
+  
+  - name: "AI Fabrix User"
+    value: "aifabrix-user"
+    description: "Basic user access to the application"
+  
+  - name: "AI Fabrix Developer"
+    value: "aifabrix-developer"
+    description: "Developer access for testing and debugging"
+
+permissions:
+  - name: "myapp:read"
+    roles: 
+      - "aifabrix-user"
+      - "aifabrix-admin"
+      - "aifabrix-developer"
+    description: "Read access to application data"
+  
+  - name: "myapp:write"
+    roles:
+      - "aifabrix-admin"
+      - "aifabrix-developer"
+    description: "Create and edit application data"
+  
+  - name: "myapp:delete"
+    roles:
+      - "aifabrix-admin"
+    description: "Delete application data"
+  
+  - name: "myapp:admin"
+    roles:
+      - "aifabrix-admin"
+    description: "Administrative access to application configuration"
+

package/templates/applications/keycloak/variables.yaml

@@ -0,0 +1,56 @@
+# Application Metadata
+app:
+  key: keycloak
+  displayName: "AI Fabrix Keycloak"
+  description: "Identity and Access Management"
+  type: webapp
+
+# Image Configuration
+image:
+  name: aifabrix/keycloak
+  tag: "latest"
+  registry: devflowiseacr.azurecr.io
+  registryMode: acr
+
+# Port Configuration
+port: 8082
+
+# Azure Requirements
+requires:
+  database: true
+  databases:
+    - name: keycloak
+  redis: false
+  storage: false
+
+# Health Check
+healthCheck:
+  path: /health
+  interval: 30
+  probePath: /health
+  probeRequestType: GET
+  probeProtocol: Https
+  probeIntervalInSeconds: 120
+
+# Authentication
+authentication:
+  type: keycloak
+  enableSSO: true
+  requiredRoles: ["aifabrix-user"]
+  endpoints:
+    local: "http://localhost:8082/auth/callback"
+
+# Build Configuration
+build:
+  context: ..                                           # Docker build context (relative to builder/)
+  dockerfile: builder/Dockerfile                        # Dockerfile name (empty = use template)
+  envOutputPath: .env                                   # Copy .env to repo root for local dev
+  localPort: 8082                                       # Port for local development (different from Docker port)
+  containerPort: 8080                                   # Container port (different from local port)
+  language: typescript                                  # Runtime language for template selection
+  secrets:                                              # Path to secrets file (optional)
+
+# Docker Compose
+compose:
+  file: docker-compose.yaml
+  service: keycloak

package/templates/applications/miso-controller/Dockerfile

@@ -0,0 +1,125 @@
+# AI Fabrix Miso Controller - Optimized Dockerfile
+FROM node:18-alpine
+
+# Install only essential runtime dependencies
+RUN apk add --no-cache \
+    curl \
+    wget \
+    openssl \
+    openssl-dev
+
+# Install PNPM globally
+RUN npm install -g pnpm
+
+# Install tsconfig-paths globally for path resolution
+RUN npm install -g tsconfig-paths
+
+# Set working directory
+WORKDIR /app
+
+# Copy package files for dependency resolution
+COPY package*.json ./
+COPY pnpm-workspace.yaml ./
+COPY packages/miso-azure/package*.json ./packages/miso-azure/
+COPY packages/miso-controller/package*.json ./packages/miso-controller/
+COPY packages/miso-controller/bin ./packages/miso-controller/bin
+COPY packages/miso-ui/package*.json ./packages/miso-ui/
+
+# Create .npmrc for hoisting to fix module resolution in Docker
+RUN echo "shamefully-hoist=true" > .npmrc
+
+# Install all dependencies (including dev for building)
+RUN pnpm install
+
+# Copy only the source code we need
+COPY packages/miso-azure/src ./packages/miso-azure/src
+COPY packages/miso-azure/tsconfig.json ./packages/miso-azure/
+COPY packages/miso-controller/src ./packages/miso-controller/src
+COPY packages/miso-controller/tsconfig.json ./packages/miso-controller/
+COPY packages/miso-controller/tsconfig.docker.json ./packages/miso-controller/
+COPY packages/miso-controller/openapi/openapi-complete.yaml ./packages/miso-controller/dist/openapi/
+COPY packages/miso-controller/openapi/openapi-complete.json ./packages/miso-controller/dist/openapi/
+COPY packages/miso-ui/src ./packages/miso-ui/src
+COPY packages/miso-ui/tsconfig.json ./packages/miso-ui/
+COPY packages/miso-ui/tsconfig.app.json ./packages/miso-ui/
+COPY packages/miso-ui/tsconfig.node.json ./packages/miso-ui/
+COPY packages/miso-ui/vite.config.ts ./packages/miso-ui/
+COPY packages/miso-ui/index.html ./packages/miso-ui/
+
+# Fix Rollup native module issue for Alpine Linux
+RUN pnpm add @rollup/rollup-linux-x64-musl @types/express-serve-static-core --workspace-root
+
+# Build packages
+WORKDIR /app/packages/miso-azure
+RUN pnpm run build
+
+WORKDIR /app/packages/miso-ui  
+RUN pnpm run build
+
+WORKDIR /app/packages/miso-controller
+RUN pnpm run db:generate
+RUN pnpm exec tsc -p tsconfig.docker.json || true
+# Copy sensitive-fields.config.json to dist folder
+RUN mkdir -p dist/src/services/logging && \
+    cp src/services/logging/sensitive-fields.config.json dist/src/services/logging/ || true
+
+# Return to root to prune correctly (needed to keep workspace dependencies)
+WORKDIR /app
+
+# Remove source files and build artifacts, but preserve Prisma schema files and OpenAPI files
+RUN mkdir -p packages/miso-controller/dist/database/prisma && \
+    cp packages/miso-controller/src/database/prisma/*.prisma packages/miso-controller/dist/database/prisma/ || true
+RUN rm -rf packages/miso-azure/src packages/miso-controller/src packages/miso-ui/src
+RUN rm -rf packages/miso-azure/tsconfig.json packages/miso-ui/tsconfig.json
+RUN rm -rf packages/*/node_modules packages/*/.git packages/*/.github
+
+# Reinstall to recreate symlinks after removing source files
+# This ensures workspace dependencies are properly linked
+RUN pnpm install --frozen-lockfile --filter "@aifabrix/miso-controller..." || pnpm install --frozen-lockfile
+
+# Manually remove known dev dependencies
+RUN rm -rf node_modules/markdownlint node_modules/markdownlint-cli node_modules/prettier
+RUN rm -rf .pnpm/markdownlint* .pnpm/prettier*
+
+# Create non-root user
+RUN addgroup -g 1001 -S nodejs && \
+    adduser -S miso -u 1001
+
+# Create necessary directories for mount points (with fallback to local storage)
+RUN mkdir -p /mnt/data/logs /mnt/data/data /mnt/data/backup /mnt/data/config
+RUN mkdir -p /app/data/logs /app/data/data /app/data/backup /app/data/config
+
+# Change ownership of app directory and mount points
+RUN chown -R miso:nodejs /app /mnt/data
+
+# Switch to non-root user
+USER miso
+
+# Set working directory to controller
+WORKDIR /app/packages/miso-controller
+
+# Expose port
+EXPOSE 3000
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:3000/health || exit 1
+
+# Set environment variable for tsconfig-paths
+ENV TS_NODE_PROJECT=tsconfig.docker.json
+
+# Set default data paths (can be overridden by environment variables)
+ENV LOG_PATH=/mnt/data/logs
+ENV DATA_PATH=/mnt/data/data
+ENV BACKUP_PATH=/mnt/data/backup
+ENV CONFIG_PATH=/mnt/data/config
+
+# Create symlinks for fallback to local storage if mounts are not provided
+RUN ln -sf /app/data/logs /mnt/data/logs || true
+RUN ln -sf /app/data/data /mnt/data/data || true  
+RUN ln -sf /app/data/backup /mnt/data/backup || true
+RUN ln -sf /app/data/config /mnt/data/config || true
+
+# Start the application
+CMD ["node", "-r", "tsconfig-paths/register", "dist/src/server.js"]
+

package/templates/applications/miso-controller/env.template

@@ -0,0 +1,129 @@
+# Environment Variables Template
+# Use kv:// references for secrets (resolved from secrets.local.yaml)
+# Use ${VAR} for environment-specific values
+
+# =============================================================================
+# APPLICATION ENVIRONMENT
+# =============================================================================
+
+NODE_ENV=development
+PORT=3000
+AUTO_CREATE_TABLES=true
+FAST_STARTUP=false
+ALLOWED_ORIGINS=http://localhost:3000,http://localhost:5173
+ENABLE_API_DOCS=true
+
+# Package Version (auto-set by npm/pnpm, optional override)
+# npm_package_version=1.0.0
+
+# =============================================================================
+# DATABASE CONFIGURATION
+# =============================================================================
+# Connects to external postgres from aifabrix-setup
+
+DATABASE_URL=kv://databases-miso-controller-0-urlKeyVault
+DATABASELOG_URL=kv://databases-miso-controller-1-urlKeyVault
+MISO_ADMIN_PASSWORD=kv://miso-controller-admin-passwordKeyVault
+
+# =============================================================================
+# REDIS CONFIGURATION
+# =============================================================================
+# Connects to external redis from aifabrix-setup
+
+REDIS_URL=kv://redis-urlKeyVault
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=kv://redis-passwordKeyVault
+REDIS_DB=0
+REDIS_KEY_PREFIX=miso
+REDIS_ROLES_TTL=900
+REDIS_PERMISSIONS_TTL=900
+
+# =============================================================================
+# KEYCLOAK CONFIGURATION
+# =============================================================================
+# Connects to external keycloak from aifabrix-setup
+
+KEYCLOAK_REALM=aifabrix
+KEYCLOAK_AUTH_SERVER_URL=kv://keycloak-auth-server-urlKeyVault
+KEYCLOAK_CLIENT_ID=miso-controller
+KEYCLOAK_CLIENT_SECRET=kv://keycloak-client-secretKeyVault
+KEYCLOAK_ADMIN_USERNAME=admin
+KEYCLOAK_ADMIN_PASSWORD=kv://keycloak-admin-passwordKeyVault
+KEYCLOAK_PUBLIC_KEY=
+KEYCLOAK_VERIFY_AUDIENCE=false
+KEYCLOAK_TOKEN_TIMEOUT=5000
+KEYCLOAK_DEFAULT_PASSWORD=kv://keycloak-admin-passwordKeyVault
+
+# Keycloak Events Configuration
+KEYCLOAK_EVENTS_ENABLED=true
+KEYCLOAK_EVENTS_VERIFY_SIGNATURE=true
+KEYCLOAK_EVENTS_SECRET=kv://keycloak-events-secretKeyVault
+
+# =============================================================================
+# AZURE AD PROVIDER CONFIGURATION
+# =============================================================================
+
+AZURE_SUBSCRIPTION_ID=kv://azure-subscription-idKeyVault
+AZURE_TENANT_ID=kv://azure-tenant-idKeyVault
+AZURE_SERVICE_NAME=kv://azure-service-nameKeyVault
+MOCK=true
+AZURE_CLIENT_ID=kv://azure-client-idKeyVault
+AZURE_CLIENT_SECRET=kv://azure-client-secretKeyVault
+
+# Mock Mode (set to false for production)
+MOCK=true
+
+# =============================================================================
+# SECURITY & ENCRYPTION
+# =============================================================================
+
+# Encryption Key for Database Secrets
+ENCRYPTION_KEY=kv://secrets-encryptionKeyVault
+
+# JWT Configuration (for client token generation)
+JWT_SECRET=kv://miso-controller-jwt-secretKeyVault
+
+# When API_KEY is set, a matching Bearer token bypasses OAuth2 validation
+API_KEY=kv://miso-controller-api-key-secretKeyVault
+
+# =============================================================================
+# MISO CONTROLLER CONFIGURATION
+# =============================================================================
+
+# MISO Controller URL
+MISO_CONTROLLER_URL=kv://miso-controller-url
+
+# Web Server URL (for OpenAPI documentation server URLs)
+# Used to generate correct server URLs in OpenAPI spec
+WEB_SERVER_URL=kv ://web-server-url
+
+# MISO Environment Configuration (miso, dev, tst, pro)
+MISO_ENVIRONMENT=miso
+
+# MISO Application Client Credentials (per application)
+MISO_CLIENTID=kv ://miso-client-idKeyVault
+MISO_CLIENTSECRET=kv ://miso-client-secretKeyVault
+
+# =============================================================================
+# MORI SERVICE CONFIGURATION
+# =============================================================================
+
+MORI_BASE_URL=kv://mori-base-urlKeyVault
+MORI_API_KEY=kv ://mori-api-keyKeyVault
+
+# =============================================================================
+# LOGGING CONFIGURATION
+# =============================================================================
+
+LOG_TO_FILE=true
+LOG_FILE_PATH=/mnt/data/logs
+
+# =============================================================================
+# STORAGE CONFIGURATION
+# =============================================================================
+
+# Mount Volume Configuration
+MOUNT_VOLUME=C:/git/esystemsdev/aifabrix-miso/mount
+
+

package/templates/applications/miso-controller/rbac.yaml

@@ -0,0 +1,168 @@
+roles:
+  - name: "AI Fabrix Platform Admin"
+    value: "aifabrix-platform-admin"
+    description: "Full platform infrastructure management and enterprise controller access"
+    Groups: ["AI-Fabrix-Platform-Admins"]
+  
+  - name: "AI Fabrix Security Admin"
+    value: "aifabrix-security-admin"
+    description: "Security and compliance management for enterprise controller"
+    Groups: ["AI-Fabrix-Security-Admins"]
+  
+  - name: "AI Fabrix Infrastructure Admin"
+    value: "aifabrix-infrastructure-admin"
+    description: "Infrastructure deployment and management across environments"
+    Groups: ["AI-Fabrix-Infrastructure-Admins"]
+  
+  - name: "AI Fabrix Deployment Admin"
+    value: "aifabrix-deployment-admin"
+    description: "Application deployment orchestration and environment management"
+    Groups: ["AI-Fabrix-Deployment-Admins"]
+  
+  - name: "AI Fabrix Compliance Admin"
+    value: "aifabrix-compliance-admin"
+    description: "ISO 27001 compliance monitoring and audit management"
+    Groups: ["AI-Fabrix-Compliance-Admins"]
+  
+  - name: "AI Fabrix Developer"
+    value: "aifabrix-developer"
+    description: "Developer access to deploy applications via GitHub Actions"
+    Groups: ["AI-Fabrix-Developers"]
+  
+  - name: "AI Fabrix Observer"
+    value: "aifabrix-observer"
+    description: "Read-only access to monitoring, logs, and compliance reports"
+    Groups: ["AI-Fabrix-Observers"]
+
+permissions:
+  # Service User Management
+  - name: "service-user:create"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin"]
+    description: "Create service users and API clients"
+  
+  - name: "service-user:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin", "aifabrix-observer"]
+    description: "View service users and their configurations"
+  
+  - name: "service-user:update"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin"]
+    description: "Update service user configurations and regenerate secrets"
+  
+  - name: "service-user:delete"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin"]
+    description: "Deactivate service users"
+  
+  # Template Applications (environment = null)
+  - name: "applications:create"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin", "aifabrix-deployment-admin"]
+    description: "Register new application templates"
+  
+  - name: "applications:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin", "aifabrix-deployment-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View application templates"
+  
+  - name: "applications:update"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin", "aifabrix-deployment-admin"]
+    description: "Update application templates"
+  
+  - name: "applications:delete"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin"]
+    description: "Remove application templates"
+  
+  # Environments
+  - name: "environments:create"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin"]
+    description: "Create new environments (dev, tst, pro, miso)"
+  
+  - name: "environments:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin", "aifabrix-deployment-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View environments and their status"
+  
+  - name: "environments:update"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin"]
+    description: "Update environment configuration"
+  
+  - name: "environments:delete"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin"]
+    description: "Delete environments"
+  
+  # Environment Applications
+  - name: "environments_applications:create"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer"]
+    description: "Create applications within environments"
+  
+  - name: "environments_applications:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View applications within environments"
+  
+  - name: "environments_applications:update"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer"]
+    description: "Update applications within environments"
+  
+  - name: "environments_applications:delete"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin"]
+    description: "Remove applications from environments"
+  
+  # Pipeline & Deployment
+  - name: "applications:deploy"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer"]
+    description: "Deploy applications to environments"
+  
+  - name: "deployments:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View deployment history and status"
+  
+  # Controller Operations
+  - name: "controller:admin"
+    roles: ["aifabrix-platform-admin"]
+    description: "Full administrative access to controller operations"
+  
+  - name: "controller:deploy"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin", "aifabrix-deployment-admin"]
+    description: "Deploy infrastructure and manage environments"
+  
+  - name: "controller:monitor"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin", "aifabrix-observer"]
+    description: "Monitor system health and view logs"
+  
+  - name: "controller:compliance"
+    roles: ["aifabrix-platform-admin", "aifabrix-compliance-admin"]
+    description: "Access compliance reports and audit logs"
+  
+  # Authentication & Authorization
+  - name: "auth:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View user roles and permissions"
+  
+  # Logs
+  - name: "logs:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin", "aifabrix-compliance-admin", "aifabrix-observer"]
+    description: "View application and audit logs"
+  
+  - name: "logs:write"
+    roles: ["aifabrix-platform-admin", "aifabrix-developer"]
+    description: "Write audit and error logs"
+  
+  # Admin Operations
+  - name: "admin.sync"
+    roles: ["aifabrix-platform-admin", "aifabrix-infrastructure-admin"]
+    description: "Full system synchronization operations"
+  
+  - name: "admin.keycloak"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin"]
+    description: "Keycloak administration and configuration"
+  
+  # Cache Management
+  - name: "cache:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-security-admin", "aifabrix-observer"]
+    description: "View cache statistics and performance metrics"
+  
+  - name: "cache:admin"
+    roles: ["aifabrix-platform-admin"]
+    description: "Manage cache (clear, invalidate patterns)"
+  
+  # Dashboard
+  - name: "dashboard:read"
+    roles: ["aifabrix-platform-admin", "aifabrix-deployment-admin", "aifabrix-developer", "aifabrix-observer"]
+    description: "View dashboard summaries and aggregates"
+

package/templates/applications/miso-controller/variables.yaml

@@ -0,0 +1,56 @@
+# Application Metadata
+app:
+  key: miso
+  displayName: "Miso Controller"
+  description: "AI Fabrix Miso Controller - Backend API and orchestration service"
+  type: webapp
+
+# Image Configuration
+image:
+  name: aifabrix/miso-controller
+  registry: devflowiseacr.azurecr.io
+  registryMode: acr
+
+# Port Configuration
+port: 3000
+
+# Azure Requirements
+requires:
+  database: true
+  databases:
+    - name: miso
+    - name: miso-logs
+  redis: true
+  storage: true
+
+# Health Check
+healthCheck:
+  path: /health
+  interval: 30
+  probePath: /health
+  probeRequestType: GET
+  probeProtocol: Https
+  probeIntervalInSeconds: 120
+
+# Authentication
+authentication:
+  type: keycloak
+  enableSSO: true
+  requiredRoles: ["aifabrix-user"]
+  endpoints:
+    local: "http://localhost:3000/auth/callback"
+
+# Build Configuration
+build:
+  context: ..                                           # Docker build context (relative to builder/)
+  dockerfile: builder/Dockerfile                        # Dockerfile name (empty = use template)
+  envOutputPath: ../packages/miso-controller/.env       # Copy .env to repo root for local dev
+  localPort: 3010                                       # Port for local development (different from Docker port)
+  language: typescript                                  # Runtime language for template selection
+  secrets:                                              # Path to secrets file (optional)
+
+# Docker Compose
+compose:
+  file: docker-compose.yaml
+  service: miso-controller
+

package/templates/github/release.yaml.hbs

@@ -33,37 +33,16 @@ jobs:
             exit 1
           fi
 
-{{#if publishToNpm}}
-  publish-npm:
-    name: Publish to NPM
-    runs-on: ubuntu-latest
-    needs: validate
-    steps:
-      - uses: actions/checkout@v4
-      
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-          registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
-      
-      - name: Install dependencies
-        run: npm ci
-      
-      - name: Build package
-        run: npm run build
-      
-      - name: Publish to NPM
-        run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+{{#each githubSteps}}
+{{#if (lookup ../stepContent this)}}
+{{{lookup ../stepContent this}}}
 {{/if}}
+{{/each}}
 
   create-release:
     name: Create GitHub Release
     runs-on: ubuntu-latest
-    needs: {{#if publishToNpm}}publish-npm{{else}}validate{{/if}}
+    needs: {{#if hasNpmStep}}publish-npm{{else}}validate{{/if}}
     steps:
       - uses: actions/checkout@v4
       

package/templates/github/steps/npm.hbs

@@ -0,0 +1,24 @@
+  publish-npm:
+    name: Publish to NPM
+    runs-on: ubuntu-latest
+    needs: validate
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'npm'
+      
+      - name: Install dependencies
+        run: npm ci
+      
+      - name: Build package
+        run: npm run build
+      
+      - name: Publish to NPM
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/templates/infra/compose.yaml

@@ -20,7 +20,7 @@ services:
       - postgres_data:/var/lib/postgresql/data
       - ./init-scripts:/docker-entrypoint-initdb.d
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U pgadmin -d postgres"]
       interval: 10s
@@ -38,7 +38,7 @@ services:
     volumes:
       - redis_data:/data
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s
@@ -61,7 +61,7 @@ services:
       postgres:
         condition: service_healthy
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
 
   # Optional: Redis Commander for Redis management
   redis-commander:
@@ -79,7 +79,7 @@ services:
       redis:
         condition: service_healthy
     networks:
-      - aifabrix-network
+      - infra_aifabrix-network
 
 volumes:
   postgres_data:
@@ -88,6 +88,6 @@ volumes:
     driver: local
 
 networks:
-  aifabrix-network:
+  infra_aifabrix-network:
     driver: bridge
-    name: aifabrix-network
+    name: infra_aifabrix-network