Postgres and dashboard

Author: NolanTrem

docker/compose.full.yaml

@@ -18,13 +18,8 @@ services:
   postgres:
     image: pgvector/pgvector:pg16
     profiles: [postgres]
-    environment:
-      - POSTGRES_USER=${R2R_POSTGRES_USER:-postgres}
-      - POSTGRES_PASSWORD=${R2R_POSTGRES_PASSWORD:-postgres}
-      - POSTGRES_HOST=${R2R_POSTGRES_HOST:-postgres}
-      - POSTGRES_PORT=${R2R_POSTGRES_PORT:-5432}
-      - POSTGRES_MAX_CONNECTIONS=${R2R_POSTGRES_MAX_CONNECTIONS:-1024}
-      - PGPORT=${R2R_POSTGRES_PORT:-5432}
+    env_file:
+      - ./env/postgres.env
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
@@ -255,111 +250,8 @@ services:
     image: ${R2R_IMAGE:-ragtoriches/prod:latest}
     ports:
       - "${R2R_PORT:-7272}:${R2R_PORT:-7272}"
-    environment:
-      - PYTHONUNBUFFERED=1
-      - R2R_PORT=${R2R_PORT:-7272}
-      - R2R_HOST=${R2R_HOST:-0.0.0.0}
-
-      # R2R
-      - R2R_LOG_LEVEL=${R2R_LOG_LEVEL:-INFO}
-      - R2R_LOG_CONSOLE_FORMATTER=${R2R_LOG_CONSOLE_FORMATTER:-json}
-      - R2R_CONFIG_NAME=${R2R_CONFIG_NAME:-}
-      - R2R_CONFIG_PATH=${R2R_CONFIG_PATH:-}
-      - R2R_PROJECT_NAME=${R2R_PROJECT_NAME:-r2r_default}
-      - R2R_SECRET_KEY=${R2R_SECRET_KEY:-}
-
-      # Postgres
-      - R2R_POSTGRES_USER=${R2R_POSTGRES_USER:-postgres}
-      - R2R_POSTGRES_PASSWORD=${R2R_POSTGRES_PASSWORD:-postgres}
-      - R2R_POSTGRES_HOST=${R2R_POSTGRES_HOST:-postgres}
-      - R2R_POSTGRES_PORT=${R2R_POSTGRES_PORT:-5432}
-      - R2R_POSTGRES_DBNAME=${R2R_POSTGRES_DBNAME:-postgres}
-      - R2R_POSTGRES_MAX_CONNECTIONS=${R2R_POSTGRES_MAX_CONNECTIONS:-1024}
-      - R2R_POSTGRES_STATEMENT_CACHE_SIZE=${R2R_POSTGRES_STATEMENT_CACHE_SIZE:-100}
-
-      # OpenAI
-      - OPENAI_API_KEY=${OPENAI_API_KEY:-}
-      - OPENAI_API_BASE=${OPENAI_API_BASE:-}
-
-      # Azure Foundry
-      - AZURE_FOUNDRY_API_ENDPOINT=${AZURE_FOUNDRY_API_ENDPOINT:-}
-      - AZURE_FOUNDRY_API_KEY=${AZURE_FOUNDRY_API_KEY:-}
-
-      # XAI / GROK
-      - XAI_API_KEY=${XAI_API_KEY:-}
-
-      # Anthropic
-      - ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-}
-
-      # Azure
-      - AZURE_API_KEY=${AZURE_API_KEY:-}
-      - AZURE_API_BASE=${AZURE_API_BASE:-}
-      - AZURE_API_VERSION=${AZURE_API_VERSION:-}
-
-      # Google Vertex AI
-      - GOOGLE_APPLICATION_CREDENTIALS=${GOOGLE_APPLICATION_CREDENTIALS:-}
-      - VERTEX_PROJECT=${VERTEX_PROJECT:-}
-      - VERTEX_LOCATION=${VERTEX_LOCATION:-}
-
-      # Google Gemini
-      - GEMINI_API_KEY=${GEMINI_API_KEY:-}
-
-      # AWS Bedrock
-      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
-      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}
-      - AWS_REGION_NAME=${AWS_REGION_NAME:-}
-
-      # Groq
-      - GROQ_API_KEY=${GROQ_API_KEY:-}
-
-      # Cohere
-      - COHERE_API_KEY=${COHERE_API_KEY:-}
-
-      # Anyscale
-      - ANYSCALE_API_KEY=${ANYSCALE_API_KEY:-}
-
-      # Ollama
-      - OLLAMA_API_BASE=${OLLAMA_API_BASE:-http://host.docker.internal:11434}
-
-      # LM Studio
-      - LM_STUDIO_API_BASE=${LM_STUDIO_API_BASE:-http://host.docker.internal:1234}
-      - LM_STUDIO_API_KEY=${LM_STUDIO_API_KEY:-1234}
-
-      # Huggingface
-      - HUGGINGFACE_API_BASE=${HUGGINGFACE_API_BASE:-http://host.docker.internal:8080}
-      - HUGGINGFACE_API_KEY=${HUGGINGFACE_API_KEY}
-
-      # Unstructured
-      - UNSTRUCTURED_API_KEY=${UNSTRUCTURED_API_KEY:-}
-      - UNSTRUCTURED_API_URL=${UNSTRUCTURED_API_URL:-https://api.unstructured.io/general/v0/general}
-      - UNSTRUCTURED_SERVICE_URL=${UNSTRUCTURED_SERVICE_URL:-http://unstructured:7275}
-      - UNSTRUCTURED_NUM_WORKERS=${UNSTRUCTURED_NUM_WORKERS:-10}
-
-      # Hatchet
-      - HATCHET_CLIENT_TLS_STRATEGY=none
-      - HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH=${HATCHET_CLIENT_GRPC_MAX_RECV_MESSAGE_LENGTH:-134217728}
-      - HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH=${HATCHET_CLIENT_GRPC_MAX_SEND_MESSAGE_LENGTH:-134217728}
-
-      # Graphologic
-      - CLUSTERING_SERVICE_URL=http://graph_clustering:7276
-
-      # OAuth Credentials
-      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
-      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
-      - GOOGLE_REDIRECT_URI=${GOOGLE_REDIRECT_URI}
-
-      - GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
-      - GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET}
-      - GITHUB_REDIRECT_URI=${GITHUB_REDIRECT_URI}
-
-      # Other
-      - SERPER_API_KEY=${SERPER_API_KEY}
-      - SENDGRID_API_KEY=${SENDGRID_API_KEY}
-      - R2R_SENTRY_DSN=${R2R_SENTRY_DSN}
-      - R2R_SENTRY_ENVIRONMENT=${R2R_SENTRY_ENVIRONMENT}
-      - R2R_SENTRY_TRACES_SAMPLE_RATE=${R2R_SENTRY_TRACES_SAMPLE_RATE}
-      - R2R_SENTRY_PROFILES_SAMPLE_RATE=${R2R_SENTRY_PROFILES_SAMPLE_RATE}
-
+    env_file:
+      - ./env/r2r.env
     command: >
       sh -c '
         if [ -z "$${HATCHET_CLIENT_TOKEN}" ]; then
@@ -394,9 +286,8 @@ services:
 
   r2r-dashboard:
     image: ${R2R_DASHBOARD_IMAGE:-emrgntcmplxty/r2r-dashboard:latest}
-    environment:
-      - NEXT_PUBLIC_R2R_DEPLOYMENT_URL=${R2R_DEPLOYMENT_URL:-http://localhost:7272}
-      - NEXT_PUBLIC_HATCHET_DASHBOARD_URL=${HATCHET_DASHBOARD_URL:-http://localhost:${R2R_HATCHET_DASHBOARD_PORT:-7274}}
+    env_file:
+      - ./env/r2r-dashboard.env
     ports:
       - "${R2R_DASHBOARD_PORT:-7273}:3000"
 

docker/compose.yaml

@@ -6,13 +6,8 @@ services:
   postgres:
     image: pgvector/pgvector:pg16
     profiles: [postgres]
-    environment:
-      - POSTGRES_USER=${R2R_POSTGRES_USER:-postgres}
-      - POSTGRES_PASSWORD=${R2R_POSTGRES_PASSWORD:-postgres}
-      - POSTGRES_HOST=${R2R_POSTGRES_HOST:-postgres}
-      - POSTGRES_PORT=${R2R_POSTGRES_PORT:-5432}
-      - POSTGRES_MAX_CONNECTIONS=${R2R_POSTGRES_MAX_CONNECTIONS:-1024}
-      - PGPORT=${R2R_POSTGRES_PORT:-5432}
+    env_file:
+      - ./env/postgres.env
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
@@ -46,7 +41,7 @@ services:
 
   r2r-dashboard:
     image: ${R2R_DASHBOARD_IMAGE:-emrgntcmplxty/r2r-dashboard:latest}
-    environment:
-      - NEXT_PUBLIC_R2R_DEPLOYMENT_URL=${R2R_DEPLOYMENT_URL:-http://localhost:7272}
+    env_file:
+      - ./env/r2r-dashboard.env
     ports:
       - "${R2R_DASHBOARD_PORT:-7273}:3000"

docker/env/postgres.env

@@ -0,0 +1,6 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+POSTGRES_MAX_CONNECTIONS=1024
+PGPORT=5432

docker/env/r2r-dashboard.env

@@ -0,0 +1,2 @@
+NEXT_PUBLIC_R2R_DEPLOYMENT_URL=http://localhost:7272
+NEXT_PUBLIC_HATCHET_DASHBOARD_URL=http://localhost:7274