More progress

Author: cte

packages/evals/.docker/entrypoints/web.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -e
+
+echo "🚀 Starting evals web service..."
+
+wait_for_db() {
+    echo "⏳ Waiting for database..."
+
+    # postgresql://user:password@host:port/database
+    DB_HOST=$(echo $DATABASE_URL | sed -n 's/.*@\([^:]*\):.*/\1/p')
+    DB_PORT=$(echo $DATABASE_URL | sed -n 's/.*:\([0-9]*\)\/.*/\1/p')
+    DB_USER=$(echo $DATABASE_URL | sed -n 's/.*\/\/\([^:]*\):.*/\1/p')
+    DB_NAME=$(echo $DATABASE_URL | sed -n 's/.*\/\([^?]*\).*/\1/p')
+
+    DB_HOST=${DB_HOST:-db}
+    DB_PORT=${DB_PORT:-5432}
+    DB_USER=${DB_USER:-postgres}
+    DB_NAME=${DB_NAME:-evals_development}
+
+    until pg_isready -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" > /dev/null 2>&1; do
+        echo "⏳ Database not ready yet, waiting 2 seconds..."
+        sleep 2
+    done
+    
+    echo "✅ Database is ready"
+}
+
+run_migrations() {
+    echo "🔄 Running database migrations..."
+
+    if pnpm --filter @roo-code/evals db:migrate; then
+        echo "✅ Database migrations completed successfully!"
+    else
+        echo "❌ Database migration failed!"
+        exit 1
+    fi
+}
+
+start_web_service() {
+    echo "🌐 Starting web service..."
+    exec "$@"
+}
+
+main() {
+    if [ $# -eq 0 ]; then
+        set -- pnpm --filter @roo-code/web-evals dev
+    fi
+
+    if [ "$SKIP_MIGRATION" = "true" ]; then
+        echo "⏭️  Skipping migration (SKIP_MIGRATION=true)"
+        start_web_service "$@"
+        return
+    fi
+
+    if [ "$MIGRATION_ONLY" = "true" ]; then
+        echo "🔄 Running migration only (MIGRATION_ONLY=true)"
+        wait_for_db
+        run_migrations
+        echo "✅ Migration completed, exiting..."
+        exit 0
+    fi
+
+    wait_for_db
+    run_migrations
+    start_web_service "$@"
+}
+
+main "$@"

packages/evals/.gitignore

@@ -5,3 +5,4 @@
 # docker
 .docker/*
 !.docker/scripts
+!.docker/entrypoints

packages/evals/Dockerfile.web

@@ -11,7 +11,7 @@ RUN npm install -g npm@latest
 RUN npm install -g npm-run-all
 
 # Install system packages
-RUN apt update && apt install -y sudo curl git vim jq
+RUN apt update && apt install -y sudo curl git vim jq postgresql-client
 
 # Install Docker CLI
 RUN apt install -y apt-transport-https ca-certificates gnupg lsb-release
@@ -66,7 +66,10 @@ RUN pnpm install
 
 COPY --chown=vscode:vscode . ./
 
+COPY --chown=vscode:vscode packages/evals/.docker/entrypoints/web.sh /usr/local/bin/entrypoint.sh
+RUN sudo chmod +x /usr/local/bin/entrypoint.sh
+
 ENV DATABASE_URL=postgresql://postgres:password@db:5432/evals_development
 
 EXPOSE 3000
-CMD ["pnpm", "--filter", "@roo-code/web-evals", "dev"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

packages/evals/docker-compose.yml

@@ -1,7 +1,9 @@
-# docker compose build web runner
+# Server:
+# docker compose build web
+# docker compose --profile server up
 
-# docker compose up db web
-# docker compose up runner
+# Client:
+# docker compose build runner
 # docker compose up runner --no-start
 # docker run -it --rm --network evals_default evals-runner bash
 # docker run --rm --network evals_default evals-runner sh -c "pnpm --filter @roo-code/evals cli 3"
@@ -19,8 +21,25 @@ services:
             - POSTGRES_USER=postgres
             - POSTGRES_PASSWORD=password
             - POSTGRES_DATABASES=evals_development,evals_test
+        healthcheck:
+            test: ["CMD-SHELL", "pg_isready -U postgres -d evals_development"]
+            interval: 5s
+            timeout: 5s
+            retries: 5
+            start_period: 30s
         profiles:
-            - db
+            - server
+
+    redis:
+        container_name: evals-redis
+        image: redis:7-alpine
+        ports:
+            - "6379:6379"
+        volumes:
+            - ./.docker/redis:/data
+        command: redis-server --appendonly yes
+        profiles:
+            - server
 
     web:
         container_name: evals-web
@@ -34,8 +53,11 @@ services:
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
         user: "0:0" # Run as root to access docker socket.
+        depends_on:
+            db:
+                condition: service_healthy
         profiles:
-            - web
+            - server
 
     runner:
         container_name: evals-runner
@@ -45,4 +67,4 @@ services:
         stdin_open: true
         tty: true
         profiles:
-            - runner
+            - client