Archived
refactor: consolidate backend/frontend, remove api/web duplicates
- backend/ kept as canonical, api/ features merged (EBook, ReadingProgress, ReadingSettings) - frontend/ kept as canonical, web/ pages merged (Library, Reader, AddBook, Auth, Settings) - Added Dockerfiles for backend/ and frontend/ - Updated docker-compose.yml for consolidated services - Updated README, package.json workspaces - api/ and web/ directories removed
This commit is contained in:
+21
-15
@@ -5,48 +5,54 @@ services:
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
environment:
|
||||
POSTGRES_DB: cloudreader
|
||||
POSTGRES_USER: cloudreader
|
||||
POSTGRES_PASSWORD: cloudreader
|
||||
POSTGRES_DB: cloud_reader
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
ports:
|
||||
- "5432:5432"
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U cloudreader -d cloudreader"]
|
||||
test: ["CMD-SHELL", "pg_isready -U postgres -d cloud_reader"]
|
||||
interval: 5s
|
||||
timeout: 5s
|
||||
retries: 10
|
||||
|
||||
api:
|
||||
backend:
|
||||
build:
|
||||
context: ./api
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
ports:
|
||||
- "8000:8000"
|
||||
environment:
|
||||
DATABASE_URL: "postgres://cloudreader:cloudreader@db:5432/cloudreader"
|
||||
DJANGO_SECRET_KEY: "dev-secret-key-change-in-production"
|
||||
DJANGO_DEBUG: "True"
|
||||
DB_NAME: cloud_reader
|
||||
DB_USER: postgres
|
||||
DB_PASSWORD: postgres
|
||||
DB_HOST: db
|
||||
DB_PORT: "5432"
|
||||
volumes:
|
||||
- ./api:/app
|
||||
- book_uploads:/app/media
|
||||
- ./backend:/app
|
||||
- book_media:/app/media
|
||||
command: >
|
||||
sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
|
||||
web:
|
||||
frontend:
|
||||
build:
|
||||
context: ./web
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
ports:
|
||||
- "3000:3000"
|
||||
- "5173:5173"
|
||||
environment:
|
||||
VITE_API_URL: "http://localhost:8000"
|
||||
volumes:
|
||||
- ./web:/app
|
||||
- ./frontend:/app
|
||||
- /app/node_modules
|
||||
depends_on:
|
||||
- api
|
||||
- backend
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
book_uploads:
|
||||
book_media:
|
||||
Reference in New Issue
Block a user