@aifabrix/builder 2.1.7 → 2.3.0

package/templates/applications/README.md.hbs

@@ -2,56 +2,193 @@
 
 Build, run, and deploy {{displayName}} using `@aifabrix/builder`.
 
-## Install
+---
+
+## Quick Start
+
+### 1. Install
 
 ```bash
 npm install -g @aifabrix/builder
 ```
 
-## Build
+### 2. First Time Setup
 
 ```bash
-aifabrix build {{appName}}
-```
+# Check your environment
+aifabrix doctor
 
-Builds Docker image: `{{imageName}}:latest`
+# Login to controller
+aifabrix login --method device --environment dev
 
-## Run Locally
+# Register your application (gets you credentials automatically)
+aifabrix app register {{appName}} --environment dev
+```
+
+### 3. Build & Run Locally
 
 ```bash
+# Build the Docker image
+aifabrix build {{appName}}
+
+# Generate environment variables
+aifabrix resolve {{appName}}
+
+# Run locally
 aifabrix run {{appName}}
 ```
 
-**Access:** http://localhost:{{port}}
+**Access your app:** http://localhost:{{port}}
 
-**Logs:**
+**View logs:**
 ```bash
-docker logs {{appName}} -f
+docker logs aifabrix-{{appName}} -f
 ```
 
 **Stop:**
 ```bash
-docker stop {{appName}}
+docker stop aifabrix-{{appName}}
 ```
 
-## Push to Azure Container Registry
+### 4. Deploy to Azure
 
 ```bash
-aifabrix push {{appName}} --registry {{registry}} --tag latest
+# Build with version tag
+aifabrix build {{appName}} --tag v1.0.0
+
+# Push to registry
+aifabrix push {{appName}} --registry {{registry}} --tag "v1.0.0,latest"
+
+# Deploy to miso-controller
+aifabrix deploy {{appName}} --controller https://controller.aifabrix.ai --environment dev
 ```
 
-**Note:** ACR push requires `az login` or ACR credentials in `variables.yaml`
+---
+
+## Using miso-client
+
+> [miso-client](https://github.com/esystemsdev/aifabrix-miso-client)
+
+After registering your app, you automatically get credentials in your secret file. Use miso-client for login, RBAC, audit logs, etc.
+
+**Rotate credentials if needed:**
+```bash
+aifabrix app rotate-secret {{appName}} --environment dev
+```
+
+---
+
+## Reference
+
+### Common Commands
+
+```bash
+# Development
+aifabrix build {{appName}}                        # Build app
+aifabrix run {{appName}}                          # Run locally
+aifabrix dockerfile {{appName}} --force           # Generate Dockerfile
+aifabrix resolve {{appName}}                      # Generate .env file
+
+# Deployment
+aifabrix json {{appName}}                         # Preview deployment JSON
+aifabrix genkey {{appName}}                       # Generate deployment key
+aifabrix push {{appName}} --registry {{registry}} # Push to ACR
+aifabrix deploy {{appName}} --controller <url>    # Deploy to Azure
+
+# Management
+aifabrix app register {{appName}} --environment dev
+aifabrix app list --environment dev
+aifabrix app rotate-secret {{appName}} --environment dev
+
+# Utilities
+aifabrix doctor                                   # Check environment
+aifabrix login --method device --environment dev  # Login
+aifabrix --help                                   # Get help
+```
+
+### Build Options
+
+```bash
+aifabrix build {{appName}} --tag v1.0.0           # Custom tag
+aifabrix build {{appName}} --force-template       # Force template regeneration
+aifabrix build {{appName}} --language typescript  # Override language detection
+```
+
+### Run Options
+
+```bash
+aifabrix run {{appName}} --port {{port}}          # Custom port
+aifabrix run {{appName}} --debug                  # Debug output
+```
+
+### Push Options
+
+```bash
+aifabrix push {{appName}} --registry {{registry}} --tag v1.0.0
+aifabrix push {{appName}} --registry {{registry}} --tag "v1.0.0,latest,stable"
+```
+
+### Deploy Options
+
+```bash
+aifabrix deploy {{appName}} --controller <url> --environment dev
+aifabrix deploy {{appName}} --controller <url> --environment dev --no-poll
+```
+
+### Login Methods
+
+```bash
+# Device code flow
+aifabrix login --method device --environment dev
+
+# Credentials (reads from secrets.local.yaml)
+aifabrix login --method credentials --app {{appName}} --environment dev
+
+# Explicit credentials
+aifabrix login --method credentials --app {{appName}} --client-id $CLIENT_ID --client-secret $CLIENT_SECRET --environment dev
+```
+
+### Environment Variables
+
+```bash
+export AIFABRIX_HOME=/custom/path
+export AIFABRIX_SECRETS=/path/to/secrets.yaml
+```
+
+---
+
+## Troubleshooting
+
+- **"Docker not running"** → Start Docker Desktop
+- **"Not logged in"** → Run `aifabrix login` first
+- **"Port already in use"** → Use `--port` flag or change `build.localPort` in `variables.yaml` (default: {{port}})
+- **"Authentication failed"** → Run `aifabrix login` again
+- **"Build fails"** → Check Docker is running and `variables.yaml` → `build.secrets` path is correct
+- **"Can't connect"** → Verify infrastructure is running{{#if hasDatabase}} and PostgreSQL is accessible{{/if}}
+
+**Regenerate files:**
+```bash
+aifabrix resolve {{appName}} --force
+aifabrix json {{appName}}
+aifabrix genkey {{appName}}
+```
+
+---
 
 ## Prerequisites
 
 - `@aifabrix/builder` installed globally
 - Docker Desktop running
-- Infrastructure running (`aifabrix up`)
+- Azure CLI installed (for push command)
+- Authenticated with controller (for deploy command)
+{{#unless hasAnyService}}
+- Infrastructure running
+{{/unless}}
 {{#if hasDatabase}}
-- PostgreSQL database
+- PostgreSQL database (ensure infrastructure is running)
 {{/if}}
 {{#if hasRedis}}
-- Redis
+- Redis (ensure infrastructure is running)
 {{/if}}
 {{#if hasStorage}}
 - File storage configured
@@ -60,11 +197,6 @@ aifabrix push {{appName}} --registry {{registry}} --tag latest
 - Authentication/RBAC configured
 {{/if}}
 
-## Troubleshooting
-
-**Build fails:** Check Docker is running and `variables.yaml` → `build.secrets` path is correct
-
-**Can't connect:** Verify infrastructure is running (`aifabrix up`){{#if hasDatabase}} and PostgreSQL is accessible{{/if}}
-
-**Port in use:** Change `build.localPort` in `variables.yaml` (default: {{port}})
+---
 
+**Application**: {{appName}} | **Port**: {{port}} | **Registry**: {{registry}} | **Image**: {{imageName}}:latest

package/templates/applications/miso-controller/Dockerfile

@@ -1,115 +1,5 @@
-# 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
-# Copy generated Prisma logs client to dist folder (needed at runtime)
-RUN mkdir -p dist/database/generated && \
-    cp -r src/database/generated/logs-client dist/database/generated/ || 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
+# AI Fabrix Miso Controller - Build from base image
+FROM aifabrix/miso-controller:latest
 
 # Set default data paths (can be overridden by environment variables)
 ENV LOG_PATH=/mnt/data/logs
@@ -117,12 +7,10 @@ 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
+# Expose port
+EXPOSE 3000
 
-# Start the application
-CMD ["node", "-r", "tsconfig-paths/register", "dist/src/server.js"]
+# 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
 

package/templates/infra/compose.yaml.hbs

@@ -0,0 +1,93 @@
+# AI Fabrix Infrastructure Stack
+# Shared infrastructure services only
+# Generated by AI Fabrix Builder SDK
+# Developer ID: {{devId}}
+
+services:
+  # PostgreSQL Database with pgvector extension
+  postgres:
+    image: pgvector/pgvector:pg15
+    container_name: {{#if (eq devId 0)}}aifabrix-postgres{{else}}aifabrix-dev{{devId}}-postgres{{/if}}
+    environment:
+      POSTGRES_DB: postgres
+      POSTGRES_USER: pgadmin
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=C --lc-ctype=C"
+    ports:
+      - "{{postgresPort}}:5432"
+    volumes:
+      - dev{{devId}}_postgres_data:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d
+    networks:
+      - {{networkName}}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U pgadmin -d postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+
+  # Redis Cache
+  redis:
+    image: redis:7-alpine
+    container_name: {{#if (eq devId 0)}}aifabrix-redis{{else}}aifabrix-dev{{devId}}-redis{{/if}}
+    command: ["redis-server", "--appendonly", "yes"]
+    ports:
+      - "{{redisPort}}:6379"
+    volumes:
+      - dev{{devId}}_redis_data:/data
+    networks:
+      - {{networkName}}
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    restart: unless-stopped
+
+  # Optional: pgAdmin for database management
+  pgadmin:
+    image: dpage/pgadmin4:latest
+    container_name: {{#if (eq devId 0)}}aifabrix-pgadmin{{else}}aifabrix-dev{{devId}}-pgadmin{{/if}}
+    environment:
+      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
+      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
+      PGADMIN_CONFIG_SERVER_MODE: 'False'
+    ports:
+      - "{{pgadminPort}}:80"
+    restart: unless-stopped
+    depends_on:
+      postgres:
+        condition: service_healthy
+    networks:
+      - {{networkName}}
+
+  # Optional: Redis Commander for Redis management
+  redis-commander:
+    image: rediscommander/redis-commander:latest
+    container_name: {{#if (eq devId 0)}}aifabrix-redis-commander{{else}}aifabrix-dev{{devId}}-redis-commander{{/if}}
+    environment:
+      REDIS_HOSTS: ${REDIS_HOST}
+      HTTP_USER: ${REDIS_COMMANDER_USER}
+      HTTP_PASSWORD: ${REDIS_COMMANDER_PASSWORD}
+      REDIS_PASSWORD: ""
+    ports:
+      - "{{redisCommanderPort}}:8081"
+    restart: unless-stopped
+    depends_on:
+      redis:
+        condition: service_healthy
+    networks:
+      - {{networkName}}
+
+volumes:
+  dev{{devId}}_postgres_data:
+    driver: local
+  dev{{devId}}_redis_data:
+    driver: local
+
+networks:
+  {{networkName}}:
+    driver: bridge
+    name: {{networkName}}
+

package/templates/python/docker-compose.hbs

@@ -5,13 +5,13 @@
 services:
   {{app.key}}:
     image: {{image.name}}:{{image.tag}}
-    container_name: aifabrix-{{app.key}}
+    container_name: {{containerName}}
     env_file:
       - {{envFile}}
     ports:
       - "{{hostPort}}:{{containerPort}}"
     networks:
-      - infra_aifabrix-network
+      - {{networkName}}
     {{#if requiresStorage}}
     volumes:
       - "{{mountVolume}}:/mnt/data"
@@ -33,7 +33,7 @@ services:
   # Database Initialization
   db-init:
     image: pgvector/pgvector:pg15
-    container_name: aifabrix-{{app.key}}-db-init
+    container_name: {{containerName}}-db-init
     env_file:
       - ${ADMIN_SECRETS_PATH}
       - {{envFile}}
@@ -50,7 +50,7 @@ services:
       DB_PASSWORD: {{lookup databasePasswords.array 0}}
       {{/if}}
     networks:
-      - infra_aifabrix-network
+      - {{networkName}}
     command: >
       sh -c "
         export PGHOST=postgres PGPORT=5432 PGUSER=pgadmin &&
@@ -69,21 +69,29 @@ services:
         {{#if databases}}
         {{#each databases}}
         echo 'Creating {{name}} database and user...' &&
-        (psql -d postgres -c \"CREATE DATABASE \\\"{{name}}\\\";\" || true) &&
-        (psql -d postgres -c \"DROP USER IF EXISTS {{pgUserOld name}};\" || true) &&
-        (psql -d postgres -c \"CREATE USER {{pgUser name}} WITH PASSWORD '${DB_{{@index}}_PASSWORD}';\" || true) &&
-        psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{name}}\\\" TO {{pgUser name}};\" || true &&
-        psql -d {{name}} -c \"ALTER SCHEMA public OWNER TO {{pgUser name}};\" || true &&
-        psql -d {{name}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser name}};\" || true &&
+        if psql -d postgres -tAc \"SELECT 1 FROM pg_database WHERE datname = '{{name}}'\" 2>/dev/null | grep -q '^1$'; then
+          echo 'Database \\\"{{name}}\\\" already exists, all ok.'
+        else
+          (psql -d postgres -c \"CREATE DATABASE \\\"{{name}}\\\";\" || true) &&
+          (psql -d postgres -c \"DROP USER IF EXISTS \\\"{{pgUserOld name}}\\\";\" || true) &&
+          (psql -d postgres -c \"CREATE USER {{pgUser name}} WITH PASSWORD '${DB_{{@index}}_PASSWORD}';\" || true) &&
+          psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{name}}\\\" TO {{pgUser name}};\" || true &&
+          psql -d {{name}} -c \"ALTER SCHEMA public OWNER TO {{pgUser name}};\" || true &&
+          psql -d {{name}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser name}};\" || true
+        fi &&
         {{/each}}
         {{else}}
         echo 'Creating {{app.key}} database and user...' &&
-        (psql -d postgres -c \"CREATE DATABASE \\\"{{app.key}}\\\";\" || true) &&
-        (psql -d postgres -c \"DROP USER IF EXISTS {{pgUserOld app.key}};\" || true) &&
-        (psql -d postgres -c \"CREATE USER {{pgUser app.key}} WITH PASSWORD '${DB_0_PASSWORD:-${DB_PASSWORD}}';\" || true) &&
-        psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{app.key}}\\\" TO {{pgUser app.key}};\" || true &&
-        psql -d {{app.key}} -c \"ALTER SCHEMA public OWNER TO {{pgUser app.key}};\" || true &&
-        psql -d {{app.key}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser app.key}};\" || true &&
+        if psql -d postgres -tAc \"SELECT 1 FROM pg_database WHERE datname = '{{app.key}}'\" 2>/dev/null | grep -q '^1$'; then
+          echo 'Database \\\"{{app.key}}\\\" already exists, all ok.'
+        else
+          (psql -d postgres -c \"CREATE DATABASE \\\"{{app.key}}\\\";\" || true) &&
+          (psql -d postgres -c \"DROP USER IF EXISTS \\\"{{pgUserOld app.key}}\\\";\" || true) &&
+          (psql -d postgres -c \"CREATE USER {{pgUser app.key}} WITH PASSWORD '${DB_0_PASSWORD:-${DB_PASSWORD}}';\" || true) &&
+          psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{app.key}}\\\" TO {{pgUser app.key}};\" || true &&
+          psql -d {{app.key}} -c \"ALTER SCHEMA public OWNER TO {{pgUser app.key}};\" || true &&
+          psql -d {{app.key}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser app.key}};\" || true
+        fi &&
         {{/if}}
         echo 'Database initialization complete!'
       "
@@ -91,5 +99,5 @@ services:
   {{/if}}
 
 networks:
-  infra_aifabrix-network:
+  {{networkName}}:
     external: true

package/templates/typescript/docker-compose.hbs

@@ -5,13 +5,13 @@
 services:
   {{app.key}}:
     image: {{image.name}}:{{image.tag}}
-    container_name: aifabrix-{{app.key}}
+    container_name: {{containerName}}
     env_file:
       - {{envFile}}
     ports:
       - "{{hostPort}}:{{containerPort}}"
     networks:
-      - infra_aifabrix-network
+      - {{networkName}}
     {{#if requiresStorage}}
     volumes:
       - "{{mountVolume}}:/mnt/data"
@@ -33,7 +33,7 @@ services:
   # Database Initialization
   db-init:
     image: pgvector/pgvector:pg15
-    container_name: aifabrix-{{app.key}}-db-init
+    container_name: {{containerName}}-db-init
     env_file:
       - ${ADMIN_SECRETS_PATH}
       - {{envFile}}
@@ -50,7 +50,7 @@ services:
       DB_PASSWORD: {{lookup databasePasswords.array 0}}
       {{/if}}
     networks:
-      - infra_aifabrix-network
+      - {{networkName}}
     command: >
       sh -c "
         export PGHOST=postgres PGPORT=5432 PGUSER=pgadmin &&
@@ -69,21 +69,29 @@ services:
         {{#if databases}}
         {{#each databases}}
         echo 'Creating {{name}} database and user...' &&
-        (psql -d postgres -c \"CREATE DATABASE \\\"{{name}}\\\";\" || true) &&
-        (psql -d postgres -c \"DROP USER IF EXISTS {{pgUserOld name}};\" || true) &&
-        (psql -d postgres -c \"CREATE USER {{pgUser name}} WITH PASSWORD '${DB_{{@index}}_PASSWORD}';\" || true) &&
-        psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{name}}\\\" TO {{pgUser name}};\" || true &&
-        psql -d {{name}} -c \"ALTER SCHEMA public OWNER TO {{pgUser name}};\" || true &&
-        psql -d {{name}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser name}};\" || true &&
+        if psql -d postgres -tAc \"SELECT 1 FROM pg_database WHERE datname = '{{name}}'\" 2>/dev/null | grep -q '^1$'; then
+          echo 'Database \\\"{{name}}\\\" already exists, all ok.'
+        else
+          (psql -d postgres -c \"CREATE DATABASE \\\"{{name}}\\\";\" || true) &&
+          (psql -d postgres -c \"DROP USER IF EXISTS \\\"{{pgUserOld name}}\\\";\" || true) &&
+          (psql -d postgres -c \"CREATE USER {{pgUser name}} WITH PASSWORD '${DB_{{@index}}_PASSWORD}';\" || true) &&
+          psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{name}}\\\" TO {{pgUser name}};\" || true &&
+          psql -d {{name}} -c \"ALTER SCHEMA public OWNER TO {{pgUser name}};\" || true &&
+          psql -d {{name}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser name}};\" || true
+        fi &&
         {{/each}}
         {{else}}
         echo 'Creating {{app.key}} database and user...' &&
-        (psql -d postgres -c \"CREATE DATABASE \\\"{{app.key}}\\\";\" || true) &&
-        (psql -d postgres -c \"DROP USER IF EXISTS {{pgUserOld app.key}};\" || true) &&
-        (psql -d postgres -c \"CREATE USER {{pgUser app.key}} WITH PASSWORD '${DB_0_PASSWORD:-${DB_PASSWORD}}';\" || true) &&
-        psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{app.key}}\\\" TO {{pgUser app.key}};\" || true &&
-        psql -d {{app.key}} -c \"ALTER SCHEMA public OWNER TO {{pgUser app.key}};\" || true &&
-        psql -d {{app.key}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser app.key}};\" || true &&
+        if psql -d postgres -tAc \"SELECT 1 FROM pg_database WHERE datname = '{{app.key}}'\" 2>/dev/null | grep -q '^1$'; then
+          echo 'Database \\\"{{app.key}}\\\" already exists, all ok.'
+        else
+          (psql -d postgres -c \"CREATE DATABASE \\\"{{app.key}}\\\";\" || true) &&
+          (psql -d postgres -c \"DROP USER IF EXISTS \\\"{{pgUserOld app.key}}\\\";\" || true) &&
+          (psql -d postgres -c \"CREATE USER {{pgUser app.key}} WITH PASSWORD '${DB_0_PASSWORD:-${DB_PASSWORD}}';\" || true) &&
+          psql -d postgres -c \"GRANT ALL PRIVILEGES ON DATABASE \\\"{{app.key}}\\\" TO {{pgUser app.key}};\" || true &&
+          psql -d {{app.key}} -c \"ALTER SCHEMA public OWNER TO {{pgUser app.key}};\" || true &&
+          psql -d {{app.key}} -c \"GRANT ALL ON SCHEMA public TO {{pgUser app.key}};\" || true
+        fi &&
         {{/if}}
         echo 'Database initialization complete!'
       "
@@ -91,5 +99,5 @@ services:
   {{/if}}
 
 networks:
-  infra_aifabrix-network:
+  {{networkName}}:
     external: true