Skip to content

Self-improving AI Employees for everyone

Fix docker scripts.

trohitg31fe37c1f41d
diff --git a/README.md b/README.md
index 0971da87..d76809ea 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,26 @@ npm run start
Open http://localhost:3000 and register your account.
+## Docker Setup
+
+```bash
+git clone https://github.com/trohitg/MachinaOS.git
+cd MachinaOs
+npm run docker:build
+npm run docker:up
+```
+
+Open http://localhost:3000
+
+| Command | Description |
+|---------|-------------|
+| `npm run docker:up` | Start containers |
+| `npm run docker:down` | Stop containers |
+| `npm run docker:logs` | View logs |
+| `npm run docker:build` | Rebuild images |
+
+**Redis (optional):** Set `REDIS_ENABLED=true` in `.env` to enable Redis caching.
+
---
## What You Can Build
@@ -55,15 +75,6 @@ MachinaOs/
**Environment:** Edit `.env` in the project root for authentication settings, ports, and database location.
----
-
-## Docker Deployment
-
-```bash
-npm run docker:build
-npm run docker:up
-```
-
## Tech Stack
- **Frontend:** React, TypeScript, React Flow
diff --git a/docker-compose.yml b/docker-compose.yml
index d30d7458..52c1bfe0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,10 @@
services:
- # Redis Cache
+ # Redis Cache (only starts with --profile redis or COMPOSE_PROFILES=redis)
redis:
image: redis:7-alpine
container_name: machina-redis
+ profiles:
+ - redis
ports:
- "${REDIS_PORT:-6379}:6379"
volumes:
@@ -43,16 +45,14 @@ services:
- PORT=${PYTHON_BACKEND_PORT:-3010}
- TZ=UTC
- LOG_LEVEL=${LOG_LEVEL:-INFO}
- # Redis cache (override for Docker network)
- - REDIS_ENABLED=true
+ # 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
depends_on:
- redis:
- condition: service_healthy
whatsapp:
condition: service_healthy
diff --git a/package.json b/package.json
index ee9a82d5..9364db8a 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
"stop": "node scripts/stop.js",
"restart": "node scripts/restart.js",
"status": "node scripts/status.js",
- "docker:up": "docker-compose up -d",
- "docker:down": "docker-compose down",
- "docker:logs": "docker-compose logs -f",
- "docker:build": "docker-compose build",
- "docker:restart": "docker-compose restart",
+ "docker:up": "node scripts/docker.js up",
+ "docker:down": "node scripts/docker.js down",
+ "docker:logs": "node scripts/docker.js logs",
+ "docker:build": "node scripts/docker.js build",
+ "docker:restart": "node scripts/docker.js restart",
"docker:prod:up": "docker-compose -f docker-compose.prod.yml up -d",
"docker:prod:down": "docker-compose -f docker-compose.prod.yml down",
"docker:prod:build": "docker-compose -f docker-compose.prod.yml build",
diff --git a/scripts/docker.js b/scripts/docker.js
new file mode 100644
index 00000000..2f1b07dd
--- /dev/null
+++ b/scripts/docker.js
@@ -0,0 +1,74 @@
+#!/usr/bin/env node
+/**
+ * Docker compose wrapper that auto-enables Redis profile based on REDIS_ENABLED in .env
+ * Usage: node scripts/docker.js <command> [args...]
+ * Commands: up, down, build, logs, restart
+ */
+
+import { spawn } from 'child_process';
+import { readFileSync, existsSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, resolve } from 'path';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const ROOT = resolve(__dirname, '..');
+
+// Read .env file and check REDIS_ENABLED
+function isRedisEnabled() {
+ const envPath = resolve(ROOT, '.env');
+ if (!existsSync(envPath)) return false;
+
+ const content = readFileSync(envPath, 'utf8');
+ const match = content.match(/^REDIS_ENABLED\s*=\s*(.+)$/m);
+ if (!match) return false;
+
+ const value = match[1].trim().toLowerCase();
+ return value === 'true' || value === '1' || value === 'yes';
+}
+
+// Get command and args
+const [,, command, ...args] = process.argv;
+
+if (!command) {
+ console.error('Usage: node scripts/docker.js <command> [args...]');
+ console.error('Commands: up, down, build, logs, restart');
+ process.exit(1);
+}
+
+// Build docker-compose command
+const composeArgs = [];
+
+// Add Redis profile if enabled
+if (isRedisEnabled()) {
+ composeArgs.push('--profile', 'redis');
+ console.log('[Docker] Redis profile enabled (REDIS_ENABLED=true)');
+} else {
+ console.log('[Docker] Redis profile disabled (REDIS_ENABLED=false or not set)');
+}
+
+// Add command
+composeArgs.push(command);
+
+// Add command-specific defaults
+if (command === 'up') {
+ composeArgs.push('-d'); // detached by default
+}
+if (command === 'logs') {
+ composeArgs.push('-f'); // follow by default
+}
+
+// Add any additional args
+composeArgs.push(...args);
+
+console.log(`[Docker] Running: docker-compose ${composeArgs.join(' ')}`);
+
+// Run docker-compose
+const proc = spawn('docker-compose', composeArgs, {
+ cwd: ROOT,
+ stdio: 'inherit',
+ shell: true
+});
+
+proc.on('exit', (code) => {
+ process.exit(code || 0);
+});