Implemented Dockerfile and docker-compose for api and db services. TODO: implement db migrations

Author: nir1r7

backend/.dockerignore

@@ -0,0 +1,57 @@
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+*.egg-info/
+dist/
+build/
+*.egg
+
+# Virtual environments
+venv/
+env/
+ENV/
+.venv
+
+# Environment variables
+.env
+.env.local
+.env.*.local
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+
+# Testing
+.pytest_cache/
+.coverage
+htmlcov/
+.tox/
+.hypothesis/
+
+# Documentation
+*.md
+docs/
+
+# Git
+.git/
+.gitignore
+.gitattributes
+
+# Docker
+Dockerfile
+.dockerignore
+docker-compose.yml
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+
+# Logs
+*.log

backend/Dockerfile

@@ -0,0 +1,14 @@
+FROM python:3.11-slim
+
+WORKDIR /app
+
+COPY requirements.txt .
+RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
+
+COPY app ./app
+
+ENV PYTHONUNBUFFERED=1
+
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]
+
+

backend/app/core/config.py

@@ -3,12 +3,16 @@
 from pathlib import Path
 
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
-load_dotenv(BASE_DIR / ".env")
+# load_dotenv(BASE_DIR / ".env")
 
-DB_USER = os.getenv("POSTGRES_USER")
-DB_PASSWORD  = os.getenv("POSTGRES_PASSWORD")
+DB_USER = os.getenv("POSTGRES_USER", "eventrelayuser")
+DB_PASSWORD = os.getenv("POSTGRES_PASSWORD", "123")
 DB_NAME = os.getenv("POSTGRES_DB", "eventrelay")
-DB_HOST = os.getenv("POSTGRES_HOST", "LOCALHOST")
-DB_PORT = os.getenv("POSTGRES_PORT", 5432)
+DB_HOST = os.getenv("POSTGRES_HOST", "db")
+DB_PORT = os.getenv("POSTGRES_PORT", "5432")
+
+print(f"DEBUG - DB Config: user={DB_USER}, db={DB_NAME}, host={DB_HOST}, port={DB_PORT}")
+
+DATABASE_URL = f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"
+print(f"DEBUG - DATABASE_URL: {DATABASE_URL}")
 
-DATABASE_URL = f"postgresql+asyncpg://{DB_USER}:{DB_PASSWORD}@{DB_HOST}:{DB_PORT}/{DB_NAME}"

backend/app/db.py

@@ -1,10 +1,4 @@
 from databases import Database
 from app.core.config import DATABASE_URL
 
-database = Database(DATABASE_URL)
-
-async def connect_db():
-    await database.connect()
-
-async def disconnect_db():
-    await database.disconnect()
+database = Database(DATABASE_URL)

backend/app/main.py

@@ -1,6 +1,6 @@
 from fastapi import FastAPI
 from app.api.routes import events
-from app.db import connect_db, disconnect_db
+from app.db import database
 
 
 app = FastAPI(title="EventRelay")
@@ -13,8 +13,8 @@ def health():
 
 @app.on_event("startup")
 async def startup():
-    await connect_db()
+    await database.connect()
 
 @app.on_event("shutdown")
 async def shutdown():
-    await disconnect_db()
+    await database.disconnect()

backend/requirements.txt

@@ -4,7 +4,12 @@ uvicorn[standard]>=0.32.0
 pydantic>=2.9.0
 
 # Database
+databases[asyncpg]>=0.9.0
 psycopg2-binary>=2.9.9
+asyncpg>=0.30.0
+
+# Environment
+python-dotenv>=1.0.1
 
 # Cache/Queue
 redis>=5.2.0

docker-compose.yml

@@ -0,0 +1,33 @@
+services:
+  api:
+    build: ./backend
+    ports:
+      - "8000:8000"
+    environment:
+      POSTGRES_USER: eventrelayuser
+      POSTGRES_PASSWORD: 123
+      POSTGRES_DB: eventrelay
+      POSTGRES_HOST: db
+      POSTGRES_PORT: 5432
+    depends_on:
+      db:
+        condition: service_healthy
+    
+  db:
+    image: postgres:16
+    environment:
+      POSTGRES_USER: eventrelayuser
+      POSTGRES_PASSWORD: 123
+      POSTGRES_DB: eventrelay
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U eventrelayuser -d eventrelay"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+  
+volumes:
+  postgres_data: