From 40c5aed15c3ca6870e11b14bb68f9ae1045bc9a9 Mon Sep 17 00:00:00 2001
From: James Graham <j.graham@software.ac.uk>
Date: Wed, 8 Sep 2021 14:28:13 +0100
Subject: [PATCH] build: use environment variables in docker-compose

---
 .dockerignore      | 1 +
 docker-compose.yml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index e3ec79a..4ea3e66 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,6 +8,7 @@ venv/
 
 Caddyfile
 docker-compose.yml
+settings.ini
 mail.log/
 /roles/
 /static/
diff --git a/docker-compose.yml b/docker-compose.yml
index 57d1d0e..c18444b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,12 +2,14 @@ version: '3.1'
 
 services:
   web:
+    image: breccia-mapper
     build: .
     ports:
       - 8000:8000
     environment:
-      DEBUG: "true"
+      DEBUG: ${DJANGO_DEBUG}
       DATABASE_URL: sqlite:////app/db.sqlite3
+      SECRET_KEY: ${DJANGO_SECRET_KEY}
     volumes:
       - ./db.sqlite3:/app/db.sqlite3:z
       - static_files:/app/static
@@ -18,6 +20,8 @@ services:
     ports:
       - 80:80
       - 443:443
+    environment:
+      CADDY_TLS_EMAIL: ${CADDY_TLS_EMAIL}
     volumes:
       - ./Caddyfile:/etc/caddy/Caddyfile:z
       # Caddy serves static files collected by Django