avm/mostovik-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #9

Merged
avm merged 100 commits from dev into main 2026-03-17 16:06:44 +03:00
Conversation 0 Commits 100 Files Changed 247 +22 -71
2 changed files with 22 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9f4c0d06b6 - Show all commits

4
.gitea/workflows/ci-cd.yml
View File

@@ -212,7 +212,7 @@ jobs:
export IMAGE_TAG=${BRANCH_TAG} export IMAGE_TAG=${BRANCH_TAG}
docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat
docker compose -f docker-compose.prod.yml down --remove-orphans || true docker compose -f docker-compose.prod.yml down --remove-orphans || true
docker rm -f mostovik_db mostovik_redis mostovik_web mostovik_celery_worker mostovik_celery_beat 2>/dev/null || true docker rm -f mostovik_web mostovik_celery_worker mostovik_celery_beat 2>/dev/null || true
docker compose -f docker-compose.prod.yml up -d docker compose -f docker-compose.prod.yml up -d
docker image prune -f docker image prune -f
" "
@@ -266,7 +266,7 @@ jobs:
export IMAGE_TAG=${BRANCH_TAG} export IMAGE_TAG=${BRANCH_TAG}
docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat
docker compose -f docker-compose.prod.yml down --remove-orphans || true docker compose -f docker-compose.prod.yml down --remove-orphans || true
docker rm -f mostovik_db mostovik_redis mostovik_web mostovik_celery_worker mostovik_celery_beat 2>/dev/null || true docker rm -f mostovik_web mostovik_celery_worker mostovik_celery_beat 2>/dev/null || true
docker compose -f docker-compose.prod.yml up -d docker compose -f docker-compose.prod.yml up -d
docker image prune -f docker image prune -f
" "

89
docker-compose.prod.yml
View File

@@ -1,57 +1,18 @@
services: services:
db:
image: postgres:15.10
container_name: mostovik_db
restart: unless-stopped
environment:
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
volumes:
- ./data/db:/var/lib/postgresql/data
ports:
- "5432:5432"
networks:
- mostovik_network
healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
interval: 30s
timeout: 10s
retries: 3
redis:
image: redis:7-alpine
container_name: mostovik_redis
restart: unless-stopped
ports:
- "6379:6379"
volumes:
- ./data/redis:/data
networks:
- mostovik_network
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 30s
timeout: 10s
retries: 3
web: web:
image: 10.10.0.10:3000/avm/mostovik-web:${IMAGE_TAG:-dev} image: 10.10.0.10:3000/avm/mostovik-web:${IMAGE_TAG:-dev}
container_name: mostovik_web container_name: mostovik_web
restart: unless-stopped restart: unless-stopped
depends_on: networks:
db: - services_default
condition: service_healthy
redis:
condition: service_healthy
environment: environment:
- DEBUG=False - DEBUG=False
- SECRET_KEY=${SECRET_KEY} - SECRET_KEY=${SECRET_KEY}
- POSTGRES_HOST=db - POSTGRES_HOST=postgres
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_DB=${POSTGRES_DB} - POSTGRES_DB=mostovik
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=postgres
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=postgres
- REDIS_URL=redis://redis:6379/0 - REDIS_URL=redis://redis:6379/0
- CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_BROKER_URL=redis://redis:6379/0
- CELERY_RESULT_BACKEND=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0
@@ -70,52 +31,42 @@ services:
image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev} image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev}
container_name: mostovik_celery_worker container_name: mostovik_celery_worker
restart: unless-stopped restart: unless-stopped
depends_on: networks:
db: - services_default
condition: service_healthy
redis:
condition: service_healthy
environment: environment:
- DEBUG=False - DEBUG=False
- POSTGRES_HOST=db - POSTGRES_HOST=postgres
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_DB=${POSTGRES_DB} - POSTGRES_DB=mostovik
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=postgres
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=postgres
- REDIS_URL=redis://redis:6379/0 - REDIS_URL=redis://redis:6379/0
- CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_BROKER_URL=redis://redis:6379/0
- CELERY_RESULT_BACKEND=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0
volumes: volumes:
- ./logs:/app/logs - ./logs:/app/logs
networks:
- mostovik_network
command: celery -A config worker --loglevel=info command: celery -A config worker --loglevel=info
celery_beat: celery_beat:
image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev} image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev}
container_name: mostovik_celery_beat container_name: mostovik_celery_beat
restart: unless-stopped restart: unless-stopped
depends_on: networks:
db: - services_default
condition: service_healthy
redis:
condition: service_healthy
environment: environment:
- DEBUG=False - DEBUG=False
- POSTGRES_HOST=db - POSTGRES_HOST=postgres
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_DB=${POSTGRES_DB} - POSTGRES_DB=mostovik
- POSTGRES_USER=${POSTGRES_USER} - POSTGRES_USER=postgres
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=postgres
- REDIS_URL=redis://redis:6379/0 - REDIS_URL=redis://redis:6379/0
- CELERY_BROKER_URL=redis://redis:6379/0 - CELERY_BROKER_URL=redis://redis:6379/0
- CELERY_RESULT_BACKEND=redis://redis:6379/0 - CELERY_RESULT_BACKEND=redis://redis:6379/0
volumes: volumes:
- ./logs:/app/logs - ./logs:/app/logs
networks:
- mostovik_network
command: celery -A config beat --loglevel=info --scheduler django_celery_beat.schedulers:DatabaseScheduler command: celery -A config beat --loglevel=info --scheduler django_celery_beat.schedulers:DatabaseScheduler
networks: networks:
mostovik_network: services_default:
driver: bridge external: true