Adjusting Docker and docker-compose structure to fit the new project.

compose/local/django/start.sh

@@ -7,4 +7,4 @@ set -o xtrace
 
 
 python manage.py migrate
-python manage.py runserver_plus 0.0.0.0:8000
+python manage.py runserver 0.0.0.0:8000

local.yml

@@ -13,9 +13,7 @@ services:
       - postgres
     volumes:
       - .:/app
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
+    env_file: .env
     ports:
       - "8000:8000"
     command: /start.sh
@@ -27,5 +25,4 @@ services:
     volumes:
       - postgres_data_local:/var/lib/postgresql/data
       - postgres_backup_local:/backups
-    env_file:
-      - ./.envs/.local/.postgres
+    env_file: .env

production.yml

@@ -10,13 +10,21 @@ services:
     build:
       context: .
       dockerfile: ./compose/production/django/Dockerfile
+    env_file: .env
+    depends_on:
+      - postgres
+      - redis
+    command: daphne -b 0.0.0.0 -p 8000 config.asgi:channel_layer
+
+  worker:
+    build:
+      context: .
+      dockerfile: ./compose/production/django/Dockerfile
+    command: python manage.py runworker
+    env_file: .env
     depends_on:
       - postgres
       - redis
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
-    command: /gunicorn.sh
 
   postgres:
     build:
@@ -25,8 +33,6 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
       - postgres_backup:/backups
-    env_file:
-      - ./.envs/.production/.postgres
 
   caddy:
     build:
@@ -36,8 +42,7 @@ services:
       - django
     volumes:
       - caddy:/root/.caddy
-    env_file:
-      - ./.envs/.production/.caddy
+    env_file: .env
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"