чиним билд15

backend/app/database.py

@@ -6,10 +6,16 @@ import os
 
 SQLALCHEMY_DATABASE_URL = os.getenv(
     "DATABASE_URL",
-    "postgresql://postgres:postgres@postgres/support_db"
+    "postgresql://postgres:postgres123@postgres:5432/support_db"
+)
+
+engine = create_engine(
+    SQLALCHEMY_DATABASE_URL,
+    pool_pre_ping=True,
+    pool_size=5,
+    max_overflow=10
 )
 
-engine = create_engine(SQLALCHEMY_DATABASE_URL)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()

backend/docker/postgres/init.sql

@@ -1,8 +1,8 @@
--- Create the postgres superuser
+-- Create database
-CREATE USER postgres WITH PASSWORD 'postgres' SUPERUSER;
-
--- Create the database
 CREATE DATABASE support_db;
 
--- Grant privileges
+-- Connect to the database
-GRANT ALL PRIVILEGES ON DATABASE support_db TO postgres; 
+\c support_db;
+
+-- Create extensions if needed
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; 

docker-compose.yml

@@ -2,9 +2,7 @@ version: '3.8'
 
 services:
   frontend:
-    build:
+    build: frontend
-      context: ./frontend
-      dockerfile: Dockerfile
     container_name: support-frontend
     ports:
       - "80:80"
@@ -14,16 +12,15 @@ services:
       - support-network
 
   backend:
-    build:
+    build: backend
-      context: ./backend
-      dockerfile: Dockerfile
     container_name: support-backend
     environment:
-      - DATABASE_URL=postgresql://postgres:postgres@postgres/support_db
+      - DATABASE_URL=postgresql://postgres:postgres123@postgres:5432/support_db
     ports:
       - "8000:8000"
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     networks:
       - support-network
 
@@ -32,11 +29,16 @@ services:
     container_name: support-postgres
     environment:
       - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_PASSWORD=postgres123
       - POSTGRES_DB=support_db
     volumes:
       - postgres_data:/var/lib/postgresql/data
       - ./backend/docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres -d support_db"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     networks:
       - support-network