From 5a459d051692c7a9f3f5b5cb7e0a218cceb79955 Mon Sep 17 00:00:00 2001
From: "roomote[bot]" <219738659+roomote[bot]@users.noreply.github.com>
Date: Sat, 19 Jul 2025 00:10:10 -0400
Subject: [PATCH] Fix Docker port conflicts for evals services (#5909)

Co-authored-by: Roo Code <roomote@roocode.com>
Co-authored-by: Matt Rubens <mrubens@users.noreply.github.com>
---
 packages/evals/.env.development |  4 +++-
 packages/evals/.env.test        |  4 +++-
 packages/evals/README.md        | 40 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/packages/evals/.env.development b/packages/evals/.env.development
index 7970806bec..58f781d246 100644
--- a/packages/evals/.env.development
+++ b/packages/evals/.env.development
@@ -1 +1,3 @@
-DATABASE_URL=postgres://postgres:password@localhost:5432/evals_development
+DATABASE_URL=postgres://postgres:password@localhost:5433/evals_development
+EVALS_DB_PORT=5433
+EVALS_REDIS_PORT=6380
diff --git a/packages/evals/.env.test b/packages/evals/.env.test
index 2ad09c3734..8ecf74f435 100644
--- a/packages/evals/.env.test
+++ b/packages/evals/.env.test
@@ -1 +1,3 @@
-DATABASE_URL=postgres://postgres:password@localhost:5432/evals_test
+DATABASE_URL=postgres://postgres:password@localhost:5433/evals_test
+EVALS_DB_PORT=5433
+EVALS_REDIS_PORT=6380
diff --git a/packages/evals/README.md b/packages/evals/README.md
index 7ef5be139b..750454956f 100644
--- a/packages/evals/README.md
+++ b/packages/evals/README.md
@@ -89,6 +89,46 @@ The setup script does the following:
 - Prompts for an OpenRouter API key to add to `.env.local`
 - Optionally builds and installs the Roo Code extension from source
 
+## Port Configuration
+
+By default, the evals system uses the following ports:
+
+- **PostgreSQL**: 5433 (external) → 5432 (internal)
+- **Redis**: 6380 (external) → 6379 (internal)
+- **Web Service**: 3446 (external) → 3000 (internal)
+
+These ports are configured to avoid conflicts with other services that might be running on the standard PostgreSQL (5432) and Redis (6379) ports.
+
+### Customizing Ports
+
+If you need to use different ports, you can customize them by creating a `.env.local` file in the `packages/evals/` directory:
+
+```sh
+# Copy the example file and customize as needed
+cp packages/evals/.env.local.example packages/evals/.env.local
+```
+
+Then edit `.env.local` to set your preferred ports:
+
+```sh
+# Custom port configuration
+EVALS_DB_PORT=5434
+EVALS_REDIS_PORT=6381
+EVALS_WEB_PORT=3447
+
+# Optional: Override database URL if needed
+DATABASE_URL=postgres://postgres:password@localhost:5434/evals_development
+```
+
+### Port Conflict Resolution
+
+If you encounter port conflicts when running `pnpm evals`, you have several options:
+
+1. **Use the default configuration** (recommended): The system now uses non-standard ports by default
+2. **Stop conflicting services**: Temporarily stop other PostgreSQL/Redis services
+3. **Customize ports**: Use the `.env.local` file to set different ports
+4. **Use Docker networks**: Run services in isolated Docker networks
+
 ## Troubleshooting
 
 Here are some errors that you might encounter along with potential fixes: