From b6f62844bdf922bff26e05599429aeb3a0d77754 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Fri, 2 Jan 2026 15:54:20 +0200 Subject: [PATCH] Update docker-compose --- backend/docker-compose.yaml | 79 +++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 20 deletions(-) diff --git a/backend/docker-compose.yaml b/backend/docker-compose.yaml index 1df84f0..9570d77 100644 --- a/backend/docker-compose.yaml +++ b/backend/docker-compose.yaml @@ -1,33 +1,72 @@ version: "3.9" services: - postgres: - image: postgres:15 - container_name: recipes-postgres + backend: + build: ./backend + container_name: recipes-backend restart: unless-stopped - environment: - POSTGRES_USER: recipes_user - POSTGRES_PASSWORD: Aa123456 - POSTGRES_DB: recipes_db ports: - - "5432:5432" + - "8000:8000" + environment: + # Database Configuration (RDS) + DATABASE_URL: postgresql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME} + DB_USER: ${DB_USER} + DB_PASSWORD: ${DB_PASSWORD} + DB_NAME: ${DB_NAME} + DB_HOST: ${DB_HOST} + DB_PORT: ${DB_PORT:-5432} + + # Email Configuration + SMTP_HOST: ${SMTP_HOST} + SMTP_PORT: ${SMTP_PORT:-587} + SMTP_USER: ${SMTP_USER} + SMTP_PASSWORD: ${SMTP_PASSWORD} + SMTP_FROM: ${SMTP_FROM} + + # Google OAuth + GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID} + GOOGLE_CLIENT_SECRET: ${GOOGLE_CLIENT_SECRET} + GOOGLE_REDIRECT_URI: ${GOOGLE_REDIRECT_URI} + + # Microsoft Azure OAuth + AZURE_CLIENT_ID: ${AZURE_CLIENT_ID} + AZURE_CLIENT_SECRET: ${AZURE_CLIENT_SECRET} + AZURE_TENANT_ID: ${AZURE_TENANT_ID:-consumers} + AZURE_REDIRECT_URI: ${AZURE_REDIRECT_URI} + + # Frontend URL + FRONTEND_URL: ${FRONTEND_URL} + + # Cloudflare R2 Backup Configuration + R2_ENDPOINT: ${R2_ENDPOINT} + R2_ACCESS_KEY: ${R2_ACCESS_KEY} + R2_SECRET_KEY: ${R2_SECRET_KEY} + + # Backup Schedule + BACKUP_INTERVAL: ${BACKUP_INTERVAL:-weekly} + env_file: + - .env volumes: - - pgdata:/var/lib/postgresql/data - - ./schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro + - ./backups:/app/backups + - ./restores:/app/restores + networks: + - recipes-network - pgadmin: - image: dpage/pgadmin4:8 - container_name: recipes-pgadmin + frontend: + build: ./frontend + container_name: recipes-frontend restart: unless-stopped - environment: - PGADMIN_DEFAULT_EMAIL: admin@dvirlabs.com - PGADMIN_DEFAULT_PASSWORD: Aa123456 ports: - - "5050:80" + - "80:80" + environment: + VITE_API_URL: ${VITE_API_URL:-http://localhost:8000} depends_on: - - postgres + - backend + networks: + - recipes-network -volumes: - pgdata: +networks: + recipes-network: + driver: bridge