diff --git a/.dockerignore b/.dockerignore index aa37745..6cc7086 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,3 +12,5 @@ tmp .vercel *.log .git +tests +README.md diff --git a/apps/web/src/lib/queue.ts b/apps/web/src/lib/queue.ts index 98ea40e..7783303 100644 --- a/apps/web/src/lib/queue.ts +++ b/apps/web/src/lib/queue.ts @@ -5,7 +5,7 @@ let queue: Queue | null = null; export function getQueue(): Queue { if (!queue) { - queue = new Queue("codeboard:generate", { + queue = new Queue("codeboard-generate", { connection: getRedis(), }); } diff --git a/apps/worker/src/index.ts b/apps/worker/src/index.ts index c10e059..4c19533 100644 --- a/apps/worker/src/index.ts +++ b/apps/worker/src/index.ts @@ -6,7 +6,7 @@ const redisUrl = process.env.REDIS_URL ?? "redis://localhost:6379"; const connection = new IORedis(redisUrl, { maxRetriesPerRequest: null }); const worker = new Worker( - "codeboard:generate", + "codeboard-generate", async (job) => { console.log(`[worker] Processing job ${job.id}: ${job.data.repoUrl}`); return processGenerationJob(job); @@ -28,7 +28,7 @@ worker.on("failed", (job, err) => { }); worker.on("ready", () => { - console.log("[worker] Ready and waiting for jobs on codeboard:generate"); + console.log("[worker] Ready and waiting for jobs on codeboard-generate"); }); async function shutdown() { diff --git a/docker-compose.yml b/docker-compose.yml index 400b625..a14e676 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,14 +4,12 @@ services: context: . target: web ports: - - "3000:3000" + - "4100:3000" environment: - - DATABASE_URL=postgresql://codeboard:codeboard@db:5432/codeboard - REDIS_URL=redis://redis:6379 - - NEXTAUTH_URL=http://localhost:3000 depends_on: - - db - - redis + redis: + condition: service_started restart: always worker: @@ -19,37 +17,21 @@ services: context: . target: worker environment: - - DATABASE_URL=postgresql://codeboard:codeboard@db:5432/codeboard - REDIS_URL=redis://redis:6379 - OPENAI_API_KEY=${OPENAI_API_KEY:-} - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-} - LLM_MODEL=${LLM_MODEL:-} - LLM_BASE_URL=${LLM_BASE_URL:-} depends_on: - - db - - redis - restart: always - - db: - image: postgres:16-alpine - environment: - POSTGRES_USER: codeboard - POSTGRES_PASSWORD: codeboard - POSTGRES_DB: codeboard - volumes: - - postgres_data:/var/lib/postgresql/data - ports: - - "5432:5432" + redis: + condition: service_started restart: always redis: image: redis:7-alpine - ports: - - "6379:6379" volumes: - - redis_data:/data + - codeboard_redis_data:/data restart: always volumes: - postgres_data: - redis_data: + codeboard_redis_data: