From cbf5e4b503b4ad6ffb20cb8d8a4cf41c5f283320 Mon Sep 17 00:00:00 2001
From: WGAVermeer <90707235+WGAVermeer@users.noreply.github.com>
Date: Sun, 8 Mar 2026 14:36:06 +0100
Subject: [PATCH] choose correct .env

---
 Makefile          |  2 +-
 compose.dev.yaml  |  5 +++++
 compose.prod.yaml |  5 +++++
 compose.test.yaml | 10 +++-------
 compose.yaml      |  7 +++++--
 5 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 compose.prod.yaml

diff --git a/Makefile b/Makefile
index 31b7e19..4807dcb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 prod:
 	docker compose down
-	docker compose -f compose.yaml up --build
+	docker compose -f ./compose.yaml -f ./compose.prod.yaml up --build 
 
 dev:
 	docker compose down
diff --git a/compose.dev.yaml b/compose.dev.yaml
index 26c7011..f26f8bf 100644
--- a/compose.dev.yaml
+++ b/compose.dev.yaml
@@ -3,4 +3,9 @@ services:
     command: gunicorn -b 0.0.0.0:8000 website.wsgi:application
     volumes:
       - ./src:/src
+    env_file:
+      - path: .env.template
+        required: true
+      - path: .env
+        required: false
 
diff --git a/compose.prod.yaml b/compose.prod.yaml
new file mode 100644
index 0000000..a9fd68e
--- /dev/null
+++ b/compose.prod.yaml
@@ -0,0 +1,5 @@
+services:
+  web:
+    env_file:
+      - path: .env
+        required: true
diff --git a/compose.test.yaml b/compose.test.yaml
index 55a573d..4972696 100644
--- a/compose.test.yaml
+++ b/compose.test.yaml
@@ -1,12 +1,8 @@
 services:
   web:
-    env_file: 
-      - .env.template
     command: python -Wa manage.py test --noinput --parallel
     restart: "no"
-
-  db:
-    env_file: 
-      - .env.template
-
+    env_file:
+      - path: .env.template
+        required: true
     
diff --git a/compose.yaml b/compose.yaml
index 3b7cc38..da8ccf3 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -10,7 +10,6 @@ services:
       PYTHONDONTWRITEBYTECODE: 1
       PYTHONUNBUFFERED: 1
       DJANGO_SETTINGS_MODULE: ${DJANGO_SETTINGS_MODULE}
-    env_file: ".env"
     restart: unless-stopped
 
   db:
@@ -21,7 +20,11 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - postgres_data:/var/lib/postgresql
-    env_file: ".env"
+    env_file:
+      - path: .env.template
+        required: true
+      - path: .env
+        required: false
     restart: unless-stopped
 
   adminer: