Рефакторинг инфраструктуры и конфигурации проекта
- Перенесена структура Django-конфига в src/core и src/settings - Унифицирована Docker-сборка и docker-compose для dev/prod - Добавлены startup-checks (DB/Redis) и обновлены env-шаблоны - Расширена OpenAPI-документация и ответы API - Удалены устаревшие deploy/requirements/служебные скрипты - Обновлены CI/CD, README и тесты
This commit is contained in:
@@ -1,79 +1,113 @@
|
||||
x-app-build: &app-build
|
||||
context: .
|
||||
dockerfile: docker/Dockerfile
|
||||
args:
|
||||
INSTALL_DEV: "true"
|
||||
|
||||
services:
|
||||
web:
|
||||
build:
|
||||
dockerfile: ./docker/Dockerfile.web
|
||||
context: .
|
||||
container_name: mostovik_web
|
||||
db:
|
||||
image: postgres:15.10
|
||||
container_name: mostovik_db
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env.dev
|
||||
environment:
|
||||
POSTGRES_DB: ${POSTGRES_DB}
|
||||
POSTGRES_USER: ${POSTGRES_USER}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||
volumes:
|
||||
- ./data/db:/var/lib/postgresql/data
|
||||
- ./docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
|
||||
ports:
|
||||
- "5432:5432"
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 10
|
||||
|
||||
redis:
|
||||
image: redis:7-alpine
|
||||
container_name: mostovik_redis
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "8000:8000"
|
||||
# environment:
|
||||
# - DJANGO_SETTINGS_MODULE=config.settings.dev
|
||||
# - DEBUG=False
|
||||
# - SECRET_KEY=${SECRET_KEY:-django-insecure-dev-key-change-in-production}
|
||||
# - ALLOWED_HOSTS=*
|
||||
# - POSTGRES_HOST=127.0.0.1
|
||||
# - POSTGRES_PORT=5432
|
||||
# - POSTGRES_DB=mostovik
|
||||
# - POSTGRES_USER=postgres
|
||||
# - POSTGRES_PASSWORD=postgres
|
||||
# - POSTGRES_SSLMODE=disable
|
||||
# - REDIS_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_BROKER_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
|
||||
- "6379:6379"
|
||||
volumes:
|
||||
- ./data/redis:/data
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "ping"]
|
||||
interval: 10s
|
||||
timeout: 3s
|
||||
retries: 10
|
||||
|
||||
migrate:
|
||||
build:
|
||||
<<: *app-build
|
||||
target: runtime-web
|
||||
container_name: mostovik_migrate
|
||||
env_file:
|
||||
- .env.dev
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
volumes:
|
||||
- ./input:/app/input
|
||||
command: ["/app/docker/scripts/migrate.sh"]
|
||||
restart: "no"
|
||||
|
||||
web:
|
||||
build:
|
||||
<<: *app-build
|
||||
target: runtime-web
|
||||
container_name: mostovik_web
|
||||
restart: unless-stopped
|
||||
env_file:
|
||||
- .env.dev
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
ports:
|
||||
- "8000:8000"
|
||||
volumes:
|
||||
- ./src:/app/src
|
||||
- ./logs:/app/logs
|
||||
- ./media:/app/media
|
||||
- ./staticfiles:/app/staticfiles
|
||||
command: >
|
||||
sh -c "python src/manage.py migrate &&
|
||||
python src/manage.py collectstatic --noinput &&
|
||||
gunicorn config.wsgi:application --bind 0.0.0.0:8000 --workers 3 --timeout 120"
|
||||
- ./input:/app/input
|
||||
command: ["/app/docker/scripts/start-web-dev.sh"]
|
||||
|
||||
celery_worker:
|
||||
build:
|
||||
dockerfile: ./docker/Dockerfile.celery
|
||||
context: .
|
||||
<<: *app-build
|
||||
target: runtime-celery
|
||||
container_name: mostovik_celery_worker
|
||||
restart: unless-stopped
|
||||
network_mode: host
|
||||
# environment:
|
||||
# - DJANGO_SETTINGS_MODULE=config.settings.dev
|
||||
# - DEBUG=True
|
||||
# - SECRET_KEY=${SECRET_KEY:-django-insecure-dev-key-change-in-production}
|
||||
# - POSTGRES_HOST=127.0.0.1
|
||||
# - POSTGRES_PORT=5432
|
||||
# - POSTGRES_DB=mostovik
|
||||
# - POSTGRES_USER=postgres
|
||||
# - POSTGRES_PASSWORD=postgres
|
||||
# - POSTGRES_SSLMODE=disable
|
||||
# - REDIS_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_BROKER_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
|
||||
env_file:
|
||||
- .env.dev
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
volumes:
|
||||
- ./src:/app/src
|
||||
- ./logs:/app/logs
|
||||
command: celery -A config worker
|
||||
- ./input:/app/input
|
||||
command: ["/app/docker/scripts/start-celery-worker.sh"]
|
||||
|
||||
celery_beat:
|
||||
build:
|
||||
dockerfile: ./docker/Dockerfile.celery
|
||||
context: .
|
||||
<<: *app-build
|
||||
target: runtime-celery
|
||||
container_name: mostovik_celery_beat
|
||||
restart: unless-stopped
|
||||
network_mode: host
|
||||
# environment:
|
||||
# - DJANGO_SETTINGS_MODULE=config.settings.dev
|
||||
# - DEBUG=False
|
||||
# - SECRET_KEY=${SECRET_KEY:-django-insecure-dev-key-change-in-production}
|
||||
# - POSTGRES_HOST=127.0.0.1
|
||||
# - POSTGRES_PORT=5432
|
||||
# - POSTGRES_DB=mostovik
|
||||
# - POSTGRES_USER=postgres
|
||||
# - POSTGRES_PASSWORD=postgres
|
||||
# - POSTGRES_SSLMODE=disable
|
||||
# - REDIS_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_BROKER_URL=redis://127.0.0.1:6379/0
|
||||
# - CELERY_RESULT_BACKEND=redis://127.0.0.1:6379/0
|
||||
env_file:
|
||||
- .env.dev
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
volumes:
|
||||
- ./src:/app/src
|
||||
- ./logs:/app/logs
|
||||
command: celery -A config beat
|
||||
- ./input:/app/input
|
||||
command: ["/app/docker/scripts/start-celery-beat.sh"]
|
||||
|
||||
Reference in New Issue
Block a user