docker

Author: HugeFrog24

docker-compose.dev.yml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
   django:
     build:
@@ -8,16 +10,10 @@ services:
       DEBUG: "True"
       DOMAIN_NAME: localhost
       MEDIA_PATH: ./media
-      CELERY_BROKER_URL: "redis://redis:6379/0"
-      CELERY_RESULT_BACKEND: "redis://redis:6379/0"
-      REDIS_HOST: "redis"
       DJANGO_SETTINGS_MODULE: "backend.settings"
     volumes:
       - ./backend:/usr/src/app
-      - static_volume:/usr/src/app/staticfiles
     command: daphne -b 0.0.0.0 -p 8000 backend.asgi:application
-    depends_on:
-      - redis
     networks:
       - app_network
 
@@ -30,14 +26,9 @@ services:
       - ./backend:/usr/src/app
     environment:
       DEBUG: "True"
-      CELERY_BROKER_URL: "redis://redis:6379/0"
-      CELERY_RESULT_BACKEND: "redis://redis:6379/0"
       DJANGO_SETTINGS_MODULE: "backend.settings"
     command: celery -A backend worker -l info
     user: celery
-    depends_on:
-      - redis
-      - django
     networks:
       - app_network
 
@@ -50,14 +41,9 @@ services:
       - ./backend:/usr/src/app
     environment:
       DEBUG: "True"
-      CELERY_BROKER_URL: "redis://redis:6379/0"
-      CELERY_RESULT_BACKEND: "redis://redis:6379/0"
       DJANGO_SETTINGS_MODULE: "backend.settings"
     command: celery -A backend beat -l info
     user: celery
-    depends_on:
-      - redis
-      - django
     networks:
       - app_network
 
@@ -77,7 +63,6 @@ services:
     ports:
       - "80:80"
     volumes:
-      - static_volume:/var/www/staticfiles
       - ./frontend/dist:/var/www/html
       - ./media:/var/www/media
     depends_on:

docker-compose.prod.yml

@@ -1,15 +1,29 @@
+version: '3.8'
+
 services:
   django:
     image: ghcr.io/${OWNER_LC}/tibiknini:latest
     environment:
       DEBUG: "False"
       DOMAIN_NAME: boger.dev
       MEDIA_PATH: /var/www/media
-      REDIS_HOST: "redis"
+    restart: always
+
+  celery_worker:
+    image: ghcr.io/${OWNER_LC}/tibiknini:latest
+    command: celery -A backend worker -l info
+    restart: always
+
+  celery_beat:
+    image: ghcr.io/${OWNER_LC}/tibiknini:latest
+    command: celery -A backend beat -l info
     restart: always
 
   nginx:
     image: ghcr.io/${OWNER_LC}/nginx:latest
+    ports:
+      - "80:80"
+      - "443:443"
     volumes:
       - /var/www/media:/var/www/media
     restart: always

docker-compose.yml

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
     nginx:
         build: