From 76f2c8aad38ed94c12909290d9de04d8a7e6d56b Mon Sep 17 00:00:00 2001
From: Chris Estreich <cestreich@gmail.com>
Date: Tue, 24 Jun 2025 09:07:42 -0700
Subject: [PATCH] More progress (#130)

---
 .docker/Dockerfile.roomote-api        |  2 +-
 .docker/Dockerfile.roomote-controller |  1 +
 .docker/Dockerfile.roomote-dashboard  |  1 +
 .docker/Dockerfile.roomote-worker     |  1 +
 apps/roomote/package.json             |  4 ++--
 docker-compose.yml                    | 18 ++++--------------
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.docker/Dockerfile.roomote-api b/.docker/Dockerfile.roomote-api
index 935b7675de..55760939a5 100644
--- a/.docker/Dockerfile.roomote-api
+++ b/.docker/Dockerfile.roomote-api
@@ -22,6 +22,6 @@ COPY apps/roomote ./apps/roomote/
 WORKDIR /roo/apps/roomote
 RUN node_modules/.bin/next build
 
-ENV NODE_ENV=production
 EXPOSE 3001
+ENV NODE_ENV=production
 CMD ["node_modules/.bin/next", "start", "--port", "3001"]
diff --git a/.docker/Dockerfile.roomote-controller b/.docker/Dockerfile.roomote-controller
index 1ab88e9598..bdff320283 100644
--- a/.docker/Dockerfile.roomote-controller
+++ b/.docker/Dockerfile.roomote-controller
@@ -21,4 +21,5 @@ COPY apps/roomote ./apps/roomote/
 
 WORKDIR /roo/apps/roomote
 ENV NODE_ENV=production
+ENV HOST_EXECUTION_METHOD=docker
 CMD ["pnpm", "controller"]
diff --git a/.docker/Dockerfile.roomote-dashboard b/.docker/Dockerfile.roomote-dashboard
index 3e5a95fa0c..fb65511448 100644
--- a/.docker/Dockerfile.roomote-dashboard
+++ b/.docker/Dockerfile.roomote-dashboard
@@ -18,4 +18,5 @@ COPY apps/roomote-dashboard ./apps/roomote-dashboard/
 WORKDIR /roo/apps/roomote-dashboard
 
 EXPOSE 3002
+ENV NODE_ENV=production
 CMD ["pnpm", "dev"]
diff --git a/.docker/Dockerfile.roomote-worker b/.docker/Dockerfile.roomote-worker
index 92bc21c523..52a53b0c66 100644
--- a/.docker/Dockerfile.roomote-worker
+++ b/.docker/Dockerfile.roomote-worker
@@ -58,4 +58,5 @@ COPY apps/roomote ./apps/roomote/
 
 WORKDIR /roo/apps/roomote
 ENV NODE_ENV=production
+ENV HOST_EXECUTION_METHOD=docker
 CMD ["pnpm", "worker"]
diff --git a/apps/roomote/package.json b/apps/roomote/package.json
index 78e917c145..3dd9f4fa5c 100644
--- a/apps/roomote/package.json
+++ b/apps/roomote/package.json
@@ -10,8 +10,8 @@
     "build": "next build",
     "start": "next start --port 3001",
     "clean": "rimraf .next .turbo",
-    "worker": "dotenvx run -f ../../.env -- tsx src/lib/worker.ts",
-    "controller": "dotenvx run -f ../../.env -- tsx src/lib/controller.ts"
+    "worker": "tsx src/lib/worker.ts",
+    "controller": "tsx src/lib/controller.ts"
   },
   "dependencies": {
     "@roo-code-cloud/db": "workspace:^",
diff --git a/docker-compose.yml b/docker-compose.yml
index 78643c30ed..866058939c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -66,11 +66,10 @@ services:
       context: .
       dockerfile: .docker/Dockerfile.roomote-dashboard
     image: roo-code-cloud-roomote-dashboard
+    env_file:
+      - .env
     ports:
       - "3002:3002"
-    environment:
-      - REDIS_URL=redis://redis:6379
-      - NODE_ENV=production
     depends_on:
       redis:
         condition: service_started
@@ -81,12 +80,10 @@ services:
       context: .
       dockerfile: .docker/Dockerfile.roomote-api
     image: roo-code-cloud-roomote-api
+    env_file:
+      - .env
     ports:
       - "3001:3001"
-    environment:
-      - DATABASE_URL=postgres://postgres:password@postgres:5432/development
-      - REDIS_URL=redis://redis:6379
-      - NODE_ENV=production
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     depends_on:
@@ -105,11 +102,6 @@ services:
     image: roo-code-cloud-roomote-controller
     env_file:
       - .env
-    environment:
-      - HOST_EXECUTION_METHOD=docker
-      - DATABASE_URL=postgres://postgres:password@postgres:5432/development
-      - REDIS_URL=redis://redis:6379
-      - NODE_ENV=production
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp/roomote/controller:/var/log/roomote
@@ -129,8 +121,6 @@ services:
     image: roomote-worker
     env_file:
       - .env
-    environment:
-      - HOST_EXECUTION_METHOD=docker
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /tmp/roomote/worker:/var/log/roomote