.gitea/workflows/ci-cd.yml

@@ -212,7 +212,7 @@ jobs:
             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 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 image prune -f
           "
@@ -266,7 +266,7 @@ jobs:
             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 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 image prune -f
           "

docker-compose.prod.yml

@@ -1,57 +1,18 @@
 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:
     image: 10.10.0.10:3000/avm/mostovik-web:${IMAGE_TAG:-dev}
     container_name: mostovik_web
     restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+    networks:
+      - services_default
     environment:
       - DEBUG=False
       - SECRET_KEY=${SECRET_KEY}
-      - POSTGRES_HOST=db
+      - POSTGRES_HOST=postgres
       - POSTGRES_PORT=5432
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=mostovik
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
       - REDIS_URL=redis://redis:6379/0
       - CELERY_BROKER_URL=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}
     container_name: mostovik_celery_worker
     restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+    networks:
+      - services_default
     environment:
       - DEBUG=False
-      - POSTGRES_HOST=db
+      - POSTGRES_HOST=postgres
       - POSTGRES_PORT=5432
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=mostovik
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
       - REDIS_URL=redis://redis:6379/0
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
     volumes:
       - ./logs:/app/logs
-    networks:
-      - mostovik_network
     command: celery -A config worker --loglevel=info
 
   celery_beat:
     image: 10.10.0.10:3000/avm/mostovik-celery:${IMAGE_TAG:-dev}
     container_name: mostovik_celery_beat
     restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
+    networks:
+      - services_default
     environment:
       - DEBUG=False
-      - POSTGRES_HOST=db
+      - POSTGRES_HOST=postgres
       - POSTGRES_PORT=5432
-      - POSTGRES_DB=${POSTGRES_DB}
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=mostovik
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
       - REDIS_URL=redis://redis:6379/0
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
     volumes:
       - ./logs:/app/logs
-    networks:
-      - mostovik_network
     command: celery -A config beat --loglevel=info --scheduler django_celery_beat.schedulers:DatabaseScheduler
 
 networks:
-  mostovik_network:
-    driver: bridge
+  services_default:
+    external: true