Merge mailman docker changes

docker-compose.yml

@@ -60,29 +60,12 @@ services:
       - .env
     depends_on:
       - db
-      
-  celery-worker:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
-    command:
-      [
-        "celery",
-        "-A",
-        "config",
-        "worker",
-        "--concurrency=10",
-        "--loglevel=debug"
-      ]
-    env_file:
-      - .env
-    depends_on:
-      - db
-      - redis
 
   mailman-web:
     image: maxking/mailman-web
     entrypoint: /opt/mailman-docker/compose-start.sh
+    env_file:
+      - .env
     environment:
       - "DOCKER_DIR=/opt/mailman-docker"
       - "PYTHON=python3"
@@ -103,7 +86,28 @@ services:
       - ./docker:/opt/mailman-docker
     networks:
       - backend
-      
+
+  celery-worker:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    command:
+      [
+        "celery",
+        "-A",
+        "config",
+        "worker",
+        "--concurrency=10",
+        "--loglevel=debug"
+      ]
+    networks:
+      - backend
+    env_file:
+      - .env
+    depends_on:
+      - db
+      - redis
+
   celery-beat:
     build:
       context: .

env.template

@@ -30,6 +30,7 @@ MAILMAN_ADMIN_USER=""
 MAILMAN_ADMIN_EMAIL=""
 SERVE_FROM_DOMAIN=localhost
 
+# Celery settings
 CELERY_BROKER=redis://redis:6379/0
 CELERY_BACKEND=redis://redis:6379/0