Рефакторинг инфраструктуры и конфигурации проекта
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Successful in 1m52s
CI/CD Pipeline / Run Tests (push) Failing after 2m2s
CI/CD Pipeline / Build & Push Images (push) Has been skipped

- Перенесена структура 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:
2026-02-18 13:25:01 +01:00
parent 0f4af561de
commit d5d184537f
71 changed files with 1253 additions and 2318 deletions

View File

@@ -1,73 +1,74 @@
x-web-build: &web-build
context: .
dockerfile: docker/Dockerfile
target: runtime-web
args:
INSTALL_DEV: "false"
x-celery-build: &celery-build
context: .
dockerfile: docker/Dockerfile
target: runtime-celery
args:
INSTALL_DEV: "false"
services:
migrate:
build: *web-build
image: ${WEB_IMAGE:-mostovik/web:latest}
container_name: mostovik_migrate
env_file:
- .env.prod
volumes:
- ./input:/app/input
command: ["/app/docker/scripts/migrate.sh"]
restart: "no"
web:
image: 10.10.0.10:3000/avm/mostovik-web:${IMAGE_TAG:-dev}
build: *web-build
image: ${WEB_IMAGE:-mostovik/web:latest}
container_name: mostovik_web
restart: unless-stopped
env_file:
- .env.prod
depends_on:
migrate:
condition: service_completed_successfully
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
volumes:
- ./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.sh"]
celery_worker:
image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev}
build: *celery-build
image: ${CELERY_IMAGE:-mostovik/celery:latest}
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.prod
depends_on:
migrate:
condition: service_completed_successfully
volumes:
- ./logs:/app/logs
command: celery -A config worker
- ./input:/app/input
command: ["/app/docker/scripts/start-celery-worker.sh"]
celery_beat:
image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev}
build: *celery-build
image: ${CELERY_IMAGE:-mostovik/celery:latest}
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.prod
depends_on:
migrate:
condition: service_completed_successfully
volumes:
- ./logs:/app/logs
command: celery -A config beat
- ./input:/app/input
command: ["/app/docker/scripts/start-celery-beat.sh"]