Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
fix docker variables.
trohitg0ea525638ee0
diff --git a/.gitignore b/.gitignoreindex 16008366..b0b4b28c 100644--- a/.gitignore+++ b/.gitignore@@ -121,6 +121,6 @@ CLAUDE.md**/CLAUDE.md# =============================================================================-# Documentation (keep local only)+# Documentation (separate repos)# =============================================================================-docs/+docs*/diff --git a/client/Dockerfile b/client/Dockerfileindex 39580359..d275d6ca 100644--- a/client/Dockerfile+++ b/client/Dockerfile@@ -36,6 +36,18 @@ RUN npm ci# Copy application codeCOPY . .+# Build arguments for Vite environment variables (set at build time)+ARG VITE_AUTH_ENABLED=true+ARG VITE_PYTHON_SERVICE_URL=+ARG VITE_WHATSAPP_SERVICE_URL=+ARG VITE_ANDROID_RELAY_URL=++# Expose build args as environment variables for Vite build+ENV VITE_AUTH_ENABLED=$VITE_AUTH_ENABLED+ENV VITE_PYTHON_SERVICE_URL=$VITE_PYTHON_SERVICE_URL+ENV VITE_WHATSAPP_SERVICE_URL=$VITE_WHATSAPP_SERVICE_URL+ENV VITE_ANDROID_RELAY_URL=$VITE_ANDROID_RELAY_URL+# Increase Node.js memory limit for large builds (GCP e2-micro has limited RAM)ENV NODE_OPTIONS="--max-old-space-size=2048"diff --git a/client/vite.config.js b/client/vite.config.jsindex cab19d68..2092246f 100644--- a/client/vite.config.js+++ b/client/vite.config.js@@ -4,20 +4,26 @@ import { resolve } from 'path'// https://vite.dev/config/export default defineConfig(({ mode }) => {- // Load env from parent directory (root .env)- const env = loadEnv(mode, resolve(process.cwd(), '..'), '')+ // Load env from parent directory (root .env) for local development+ const fileEnv = loadEnv(mode, resolve(process.cwd(), '..'), '')++ // In Docker, env vars are set via ENV in Dockerfile, accessible via process.env+ // Priority: process.env (Docker) > fileEnv (local .env) > defaults+ const getEnv = (key, defaultValue = '') => {+ return process.env[key] || fileEnv[key] || defaultValue+ }return {plugins: [react()],// Expose VITE_ prefixed env vars to client code via import.meta.envdefine: {- 'import.meta.env.VITE_AUTH_ENABLED': JSON.stringify(env.VITE_AUTH_ENABLED || 'true'),- 'import.meta.env.VITE_PYTHON_SERVICE_URL': JSON.stringify(env.VITE_PYTHON_SERVICE_URL || ''),- 'import.meta.env.VITE_WHATSAPP_SERVICE_URL': JSON.stringify(env.VITE_WHATSAPP_SERVICE_URL || ''),- 'import.meta.env.VITE_ANDROID_RELAY_URL': JSON.stringify(env.VITE_ANDROID_RELAY_URL || ''),+ 'import.meta.env.VITE_AUTH_ENABLED': JSON.stringify(getEnv('VITE_AUTH_ENABLED', 'true')),+ 'import.meta.env.VITE_PYTHON_SERVICE_URL': JSON.stringify(getEnv('VITE_PYTHON_SERVICE_URL', '')),+ 'import.meta.env.VITE_WHATSAPP_SERVICE_URL': JSON.stringify(getEnv('VITE_WHATSAPP_SERVICE_URL', '')),+ 'import.meta.env.VITE_ANDROID_RELAY_URL': JSON.stringify(getEnv('VITE_ANDROID_RELAY_URL', '')),},server: {- port: parseInt(env.VITE_CLIENT_PORT) || 3000,+ port: parseInt(getEnv('VITE_CLIENT_PORT', '3000')),strictPort: false,host: true},diff --git a/docker-compose.prod.yml b/docker-compose.prod.ymlindex 5a4d2e7e..eca1a1b1 100644--- a/docker-compose.prod.yml+++ b/docker-compose.prod.yml@@ -22,33 +22,29 @@ services:dockerfile: Dockerfilecontainer_name: machina-backendports:- - "3010:3010"+ - "${PYTHON_BACKEND_PORT:-3010}:${PYTHON_BACKEND_PORT:-3010}"volumes:- backend-data:/app/datanetworks:- app-networkrestart: alwayshealthcheck:- test: ["CMD", "curl", "-f", "http://localhost:3010/health"]+ test: ["CMD", "curl", "-f", "http://localhost:${PYTHON_BACKEND_PORT:-3010}/health"]interval: 30stimeout: 10sretries: 3start_period: 30s+ env_file:+ - path: ./.env+ required: falseenvironment:- - PORT=3010- - TZ=UTC+ # Production overrides+ - PORT=${PYTHON_BACKEND_PORT:-3010}- ENV=production- - LOG_LEVEL=INFO- # Redis cache (internal Docker network)- REDIS_ENABLED=true- REDIS_URL=redis://redis:6379- # Android relay WebSocket (set in .env or override)- - ANDROID_RELAY_URL=${ANDROID_RELAY_URL:-}- # WhatsApp RPC service URL (internal Docker network)- - WHATSAPP_RPC_URL=ws://whatsapp:9400/ws/rpc- env_file:- - path: ./server/.env- required: false+ - WHATSAPP_RPC_URL=ws://whatsapp:${WHATSAPP_RPC_PORT:-9400}/ws/rpc+ - TZ=UTCdepends_on:redis:condition: service_healthy@@ -61,9 +57,15 @@ services:context: ./clientdockerfile: Dockerfiletarget: production+ args:+ # Pass env vars to frontend build (baked into static JS at build time)+ VITE_AUTH_ENABLED: ${VITE_AUTH_ENABLED:-true}+ VITE_PYTHON_SERVICE_URL: ${VITE_PYTHON_SERVICE_URL:-}+ VITE_WHATSAPP_SERVICE_URL: ${VITE_WHATSAPP_SERVICE_URL:-}+ VITE_ANDROID_RELAY_URL: ${VITE_ANDROID_RELAY_URL:-}container_name: machina-frontendports:- - "3000:80"+ - "${VITE_CLIENT_PORT:-3000}:80"networks:- app-networkrestart: alwaysdiff --git a/docker-compose.yml b/docker-compose.ymlindex 52c1bfe0..06532679 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -42,16 +42,11 @@ services:env_file:- .envenvironment:+ # Override specific vars for Docker networking- PORT=${PYTHON_BACKEND_PORT:-3010}- - TZ=UTC- - LOG_LEVEL=${LOG_LEVEL:-INFO}- # Redis cache - uses REDIS_ENABLED from .env (default false)- - REDIS_ENABLED=${REDIS_ENABLED:-false}- REDIS_URL=redis://redis:6379- # Android relay WebSocket (optional, set in .env)- - ANDROID_RELAY_URL=${ANDROID_RELAY_URL:-}- # WhatsApp RPC service URL (internal Docker network)- WHATSAPP_RPC_URL=ws://whatsapp:${WHATSAPP_RPC_PORT:-9400}/ws/rpc+ - TZ=UTCdepends_on:whatsapp:condition: service_healthy@@ -73,8 +68,10 @@ services:restart: unless-stoppeddepends_on:- backend+ env_file:+ - .envenvironment:- - VITE_CLIENT_PORT=${VITE_CLIENT_PORT:-3000}+ # Override for Docker networking- VITE_API_URL=http://backend:${PYTHON_BACKEND_PORT:-3010}- VITE_WS_URL=ws://backend:${PYTHON_BACKEND_PORT:-3010}- TZ=UTC