Docker story refactoring

docker-compose-dev.yaml

@@ -1,4 +1,7 @@
-version: "3"
+version: "3.8"
+
+# Development setup with hot-reload and file mounts
+# This is the ONLY compose file that mounts the source code
 
 services:
   migrations:
@@ -8,82 +11,126 @@ services:
       target: base
       args:
         - DEVELOPMENT_MODE=True
-    image: mediacms/mediacms-dev:latest
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    command: "./deploy/docker/prestart.sh"
+    image: mediacms/mediacms-dev:7.3
+    command: ["/bin/bash", "/home/mediacms.io/mediacms/scripts/run-migrations.sh"]
     environment:
-      DEVELOPMENT_MODE: True
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_SHORT: 'no'
-      ENABLE_CELERY_LONG: 'no'
-      ENABLE_CELERY_BEAT: 'no'
+      DEVELOPMENT_MODE: 'True'
+      DEBUG: 'True'
       ADMIN_USER: 'admin'
       ADMIN_EMAIL: 'admin@localhost'
       ADMIN_PASSWORD: 'admin'
-    restart: on-failure
+    restart: "no"
     depends_on:
       redis:
         condition: service_healthy
       db:
         condition: service_healthy
-  frontend:
-    image: node:20
-    volumes:
-      - ${PWD}/frontend:/home/mediacms.io/mediacms/frontend/
-    working_dir: /home/mediacms.io/mediacms/frontend/
-    command: bash -c "npm install && npm run start"
-    env_file:
-      - ${PWD}/frontend/.env
-    ports:
-      - "8088:8088"
-    depends_on:
-      - web
-  web:
-    image: mediacms/mediacms-dev:latest
-    command: "python manage.py runserver 0.0.0.0:80"
-    environment:
-      DEVELOPMENT_MODE: True
-    ports:
-      - "80:80"
     volumes:
       - ./:/home/mediacms.io/mediacms/
+
+  web:
+    image: mediacms/mediacms-dev:7.3
+    restart: unless-stopped
+    ports:
+      - "80:8000"
+    command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+    environment:
+      DEVELOPMENT_MODE: 'True'
+      DEBUG: 'True'
     depends_on:
-      - migrations
+      migrations:
+        condition: service_completed_successfully
+      redis:
+        condition: service_healthy
+      db:
+        condition: service_healthy
+    volumes:
+      - ./:/home/mediacms.io/mediacms/
+
+  frontend:
+    image: node:20-alpine
+    working_dir: /home/mediacms.io/mediacms/frontend/
+    command: sh -c "npm install && npm run start"
+    ports:
+      - "8088:8088"
+    environment:
+      - NODE_ENV=development
+    env_file:
+      - ./frontend/.env
+    volumes:
+      - ./frontend:/home/mediacms.io/mediacms/frontend/
+    depends_on:
+      - web
+
+  celery_beat:
+    image: mediacms/mediacms-dev:7.3
+    restart: unless-stopped
+    command: ["/home/mediacms.io/bin/celery", "-A", "cms", "beat", "--loglevel=INFO"]
+    environment:
+      DEVELOPMENT_MODE: 'True'
+      DEBUG: 'True'
+    depends_on:
+      migrations:
+        condition: service_completed_successfully
+      redis:
+        condition: service_healthy
+    volumes:
+      - ./:/home/mediacms.io/mediacms/
+
+  celery_short:
+    image: mediacms/mediacms-dev:7.3
+    restart: unless-stopped
+    command: ["/home/mediacms.io/bin/celery", "-A", "cms", "worker", "-Q", "short_tasks", "-c", "10", "--soft-time-limit=300", "--loglevel=INFO", "-n", "short@%h"]
+    environment:
+      DEVELOPMENT_MODE: 'True'
+      DEBUG: 'True'
+    depends_on:
+      migrations:
+        condition: service_completed_successfully
+      redis:
+        condition: service_healthy
+    volumes:
+      - ./:/home/mediacms.io/mediacms/
+
+  celery_long:
+    image: mediacms/mediacms-dev:7.3
+    restart: unless-stopped
+    command: ["/home/mediacms.io/bin/celery", "-A", "cms", "worker", "-Q", "long_tasks", "-c", "1", "-Ofair", "--prefetch-multiplier=1", "--loglevel=INFO", "-n", "long@%h"]
+    environment:
+      DEVELOPMENT_MODE: 'True'
+      DEBUG: 'True'
+    depends_on:
+      migrations:
+        condition: service_completed_successfully
+      redis:
+        condition: service_healthy
+    volumes:
+      - ./:/home/mediacms.io/mediacms/
+
   db:
     image: postgres:17.2-alpine
-    volumes:
-      - ../postgres_data:/var/lib/postgresql/data/
-    restart: always
+    restart: unless-stopped
     environment:
       POSTGRES_USER: mediacms
       POSTGRES_PASSWORD: mediacms
       POSTGRES_DB: mediacms
       TZ: Europe/London
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}", "--host=db", "--dbname=$POSTGRES_DB", "--username=$POSTGRES_USER"]
+      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
       interval: 10s
       timeout: 5s
       retries: 5
+
   redis:
-    image: "redis:alpine"
-    restart: always
+    image: redis:alpine
+    restart: unless-stopped
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
-      interval: 30s
-      timeout: 10s
+      interval: 10s
+      timeout: 5s
       retries: 3
-  celery_worker:
-    image: mediacms/mediacms-dev:latest
-    deploy:
-      replicas: 1
-    volumes:
-      - ./:/home/mediacms.io/mediacms/
-    environment:
-      ENABLE_UWSGI: 'no'
-      ENABLE_NGINX: 'no'
-      ENABLE_CELERY_BEAT: 'no'
-      ENABLE_MIGRATIONS: 'no'
-    depends_on:
-      - web
+
+volumes:
+  postgres_data: