From ff62b26001940830a6572d1cc6d322e444a89e68 Mon Sep 17 00:00:00 2001
From: sanix-darker <s4nixd@gmail.com>
Date: Sun, 30 Jun 2024 15:18:05 +0200
Subject: [PATCH] feat: regroup what could be regroup in terms of environments
 variables between services (api and worker)

---
 docker-compose.yaml | 77 ++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 47 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index c95ccc96..e17c4da8 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,5 +1,31 @@
 name: firecrawl
 version: '3.9'
+
+x-common-service: &common-service
+  build: apps/api
+  networks:
+    - backend
+  environment:
+    - REDIS_URL=${REDIS_URL:-redis://redis:6379}
+    - PLAYWRIGHT_MICROSERVICE_URL=${PLAYWRIGHT_MICROSERVICE_URL:-http://playwright-service:3000}
+    - USE_DB_AUTHENTICATION=${USE_DB_AUTHENTICATION}
+    - PORT=${PORT:-3002}
+    - NUM_WORKERS_PER_QUEUE=${NUM_WORKERS_PER_QUEUE}
+    - OPENAI_API_KEY=${OPENAI_API_KEY}
+    - SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}
+    - SERPER_API_KEY=${SERPER_API_KEY}
+    - LLAMAPARSE_API_KEY=${LLAMAPARSE_API_KEY}
+    - LOGTAIL_KEY=${LOGTAIL_KEY}
+    - BULL_AUTH_KEY=${BULL_AUTH_KEY}
+    - TEST_API_KEY=${TEST_API_KEY}
+    - POSTHOG_API_KEY=${POSTHOG_API_KEY}
+    - POSTHOG_HOST=${POSTHOG_HOST}
+    - SUPABASE_ANON_TOKEN=${SUPABASE_ANON_TOKEN}
+    - SUPABASE_URL=${SUPABASE_URL}
+    - SUPABASE_SERVICE_TOKEN=${SUPABASE_SERVICE_TOKEN}
+    - SCRAPING_BEE_API_KEY=${SCRAPING_BEE_API_KEY}
+    - HOST=${HOST:-0.0.0.0}
+
 services:
   playwright-service:
     build: apps/playwright-service
@@ -11,66 +37,23 @@ services:
       - BLOCK_MEDIA=${BLOCK_MEDIA}
     networks:
       - backend
-  
+
   api:
-    build: apps/api
-    environment:
-      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
-      - PLAYWRIGHT_MICROSERVICE_URL=${PLAYWRIGHT_MICROSERVICE_URL:-http://playwright-service:3000}
-      - USE_DB_AUTHENTICATION=${USE_DB_AUTHENTICATION}
-      - PORT=${PORT:-3002}
-      - NUM_WORKERS_PER_QUEUE=${NUM_WORKERS_PER_QUEUE}
-      - OPENAI_API_KEY=${OPENAI_API_KEY}
-      - SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}
-      - SERPER_API_KEY=${SERPER_API_KEY}
-      - LLAMAPARSE_API_KEY=${LLAMAPARSE_API_KEY}
-      - LOGTAIL_KEY=${LOGTAIL_KEY}
-      - BULL_AUTH_KEY=${BULL_AUTH_KEY}
-      - TEST_API_KEY=${TEST_API_KEY}
-      - POSTHOG_API_KEY=${POSTHOG_API_KEY}
-      - POSTHOG_HOST=${POSTHOG_HOST}
-      - SUPABASE_ANON_TOKEN=${SUPABASE_ANON_TOKEN}
-      - SUPABASE_URL=${SUPABASE_URL}
-      - SUPABASE_SERVICE_TOKEN=${SUPABASE_SERVICE_TOKEN}
-      - SCRAPING_BEE_API_KEY=${SCRAPING_BEE_API_KEY}
-      - HOST=${HOST:-0.0.0.0}
+    <<: *common-service
     depends_on:
       - redis
       - playwright-service
     ports:
       - "3002:3002"
     command: [ "pnpm", "run", "start:production" ]
-    networks:
-      - backend
 
   worker:
-    build: apps/api
-    environment:
-      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
-      - PLAYWRIGHT_MICROSERVICE_URL=${PLAYWRIGHT_MICROSERVICE_URL:-http://playwright-service:3000}
-      - USE_DB_AUTHENTICATION=${USE_DB_AUTHENTICATION}
-      - PORT=${PORT:-3002}
-      - NUM_WORKERS_PER_QUEUE=${NUM_WORKERS_PER_QUEUE}
-      - OPENAI_API_KEY=${OPENAI_API_KEY}
-      - SLACK_WEBHOOK_URL=${SLACK_WEBHOOK_URL}
-      - SERPER_API_KEY=${SERPER_API_KEY}
-      - LLAMAPARSE_API_KEY=${LLAMAPARSE_API_KEY}
-      - LOGTAIL_KEY=${LOGTAIL_KEY}
-      - BULL_AUTH_KEY=${BULL_AUTH_KEY}
-      - TEST_API_KEY=${TEST_API_KEY}
-      - POSTHOG_API_KEY=${POSTHOG_API_KEY}
-      - POSTHOG_HOST=${POSTHOG_HOST}
-      - SUPABASE_ANON_TOKEN=${SUPABASE_ANON_TOKEN}
-      - SUPABASE_URL=${SUPABASE_URL}
-      - SUPABASE_SERVICE_TOKEN=${SUPABASE_SERVICE_TOKEN}
-      - SCRAPING_BEE_API_KEY=${SCRAPING_BEE_API_KEY}
-      - HOST=${HOST:-0.0.0.0}
+    <<: *common-service
     depends_on:
       - redis
       - playwright-service
       - api
-    networks:
-      - backend
+
   redis:
     image: redis:alpine
     networks: