Skip to content

Commit 402bfb3

Browse files
committed
More progress
1 parent 2e46444 commit 402bfb3

File tree

8 files changed

+498
-7
lines changed

8 files changed

+498
-7
lines changed

apps/roomote/Dockerfile.api

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker compose build api
1+
# docker compose build base api
22

33
FROM roomote-base AS base
44

@@ -12,7 +12,7 @@ COPY packages/ipc/package.json ./packages/ipc/
1212
COPY apps/roomote/package.json ./apps/roomote/
1313

1414
COPY scripts/bootstrap.mjs ./scripts/
15-
RUN pnpm install --filter @roo-code/roomote
15+
RUN pnpm install
1616

1717
COPY apps/roomote ./apps/roomote/
1818
COPY packages/config-eslint ./packages/config-eslint/

apps/roomote/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Shared base image for roomote controller and worker
1+
# docker compose build base
22

33
FROM node:20-slim AS base
44

apps/roomote/Dockerfile.controller

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ COPY packages/ipc/package.json ./packages/ipc/
1212
COPY apps/roomote/package.json ./apps/roomote/
1313

1414
COPY scripts/bootstrap.mjs ./scripts/
15-
RUN pnpm install --filter @roo-code/roomote
15+
RUN pnpm install
1616

1717
COPY apps/roomote ./apps/roomote/
1818
COPY packages/config-eslint ./packages/config-eslint/

apps/roomote/Dockerfile.dashboard

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# docker compose build dashboard
1+
# docker compose build base dashboard
22

33
FROM roomote-base AS base
44

@@ -12,7 +12,7 @@ COPY packages/ipc/package.json ./packages/ipc/
1212
COPY apps/roomote/package.json ./apps/roomote/
1313

1414
COPY scripts/bootstrap.mjs ./scripts/
15-
RUN pnpm install --filter @roo-code/roomote
15+
RUN pnpm install
1616

1717
COPY apps/roomote ./apps/roomote/
1818
COPY packages/config-eslint ./packages/config-eslint/

apps/roomote/docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ services:
3737
build:
3838
context: ../../
3939
dockerfile: apps/roomote/Dockerfile.dashboard
40+
image: roomote-dashboard
4041
ports:
4142
- "3002:3002"
4243
environment:
@@ -52,6 +53,7 @@ services:
5253
build:
5354
context: ../../
5455
dockerfile: apps/roomote/Dockerfile.api
56+
image: roomote-api
5557
ports:
5658
- "3001:3001"
5759
environment:
@@ -74,6 +76,7 @@ services:
7476
dockerfile: apps/roomote/Dockerfile.worker
7577
args:
7678
- GH_TOKEN=${GH_TOKEN}
79+
image: roomote-worker
7780
env_file:
7881
- .env
7982
environment:
@@ -95,6 +98,7 @@ services:
9598
build:
9699
context: ../../
97100
dockerfile: apps/roomote/Dockerfile.controller
101+
image: roomote-controller
98102
env_file:
99103
- .env
100104
environment:

apps/roomote/scripts/build.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/bin/bash
2+
3+
# Build script for roomote services.
4+
# This ensures the base image is built before dependent services.
5+
6+
set -e
7+
8+
build_service() {
9+
local service=$1
10+
11+
case $service in
12+
"dashboard"|"api"|"worker"|"controller")
13+
echo "Building base image first..."
14+
docker compose build base
15+
echo "Building $service..."
16+
docker compose build $service
17+
;;
18+
"base")
19+
echo "Building base image..."
20+
docker compose build base
21+
;;
22+
*)
23+
echo "Building $service..."
24+
docker compose build $service
25+
;;
26+
esac
27+
}
28+
29+
if [ $# -eq 0 ]; then
30+
echo "Usage: $0 <service_name>"
31+
echo "Available services: base, dashboard, api, worker, controller, db, redis"
32+
echo "Example: $0 dashboard"
33+
exit 1
34+
fi
35+
36+
build_service $1
37+
38+
echo "Build completed successfully!"

apps/roomote/src/lib/runTask.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,10 @@ export const runTask = async <T extends JobType>({
119119
if (eventName === RooCodeEventName.TaskStarted) {
120120
taskStartedAt = Date.now()
121121
rooTaskId = payload[0]
122-
slackThreadTs = await slackNotifier.postTaskStarted({ jobType, jobPayload, rooTaskId })
122+
123+
if (rooTaskId) {
124+
slackThreadTs = await slackNotifier.postTaskStarted({ jobType, jobPayload, rooTaskId })
125+
}
123126
}
124127

125128
if (eventName === RooCodeEventName.TaskAborted) {

0 commit comments

Comments
 (0)