fix: remove db/redis from compose, use external services
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Successful in 1m47s
CI/CD Pipeline / Run Tests (push) Failing after 2m4s
CI/CD Pipeline / Build & Push Images (push) Successful in 17s
CI/CD Pipeline / Deploy (prod) (push) Has been skipped
CI/CD Pipeline / Deploy (dev) (push) Successful in 14s
Some checks failed
CI/CD Pipeline / Code Quality Checks (push) Successful in 1m47s
CI/CD Pipeline / Run Tests (push) Failing after 2m4s
CI/CD Pipeline / Build & Push Images (push) Successful in 17s
CI/CD Pipeline / Deploy (prod) (push) Has been skipped
CI/CD Pipeline / Deploy (dev) (push) Successful in 14s
- Use external postgres and redis from services_default network - Remove db/redis containers from deploy commands Co-Authored-By: Warp <agent@warp.dev>
This commit is contained in:
@@ -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
|
||||||
"
|
"
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user