From c7588583927e004e10599912f6d7b76413d52730 Mon Sep 17 00:00:00 2001
From: Tyler Kennedy
Date: Sat, 26 Nov 2022 12:04:04 -0500
Subject: Simplified settings

Migrated settings to typed pydantic settings---
 docker/Dockerfile         |  3 +--
 docker/docker-compose.yml | 13 ++++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9235bba..b84a391 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,8 +11,7 @@ COPY . /takahe
 
 WORKDIR /takahe
 
-# We use development here to skip settings checks
-RUN DJANGO_SETTINGS_MODULE=takahe.settings.development python3 manage.py collectstatic
+RUN TAKAHE_DATABASE_URL="postgres://dummy:dummy@localhost/postgres" python3 manage.py collectstatic
 
 EXPOSE 8000
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cacbdab..3949f56 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,11 +12,14 @@ x-takahe-common:
 
     image: takahe:latest
     environment:
-      DJANGO_SETTINGS_MODULE: takahe.settings.development
-      PGHOST: db
-      PGDATABASE: takahe
-      PGUSER: postgres
-      PGPASSWORD: insecure_password
+      TAKAHE_DATABASE_URL: "postgres://postgres:insecure_password@db/takahe"
+      TAKAHE_DEBUG: true
+      TAKAHE_SECRET_KEY: "insecure_secret"
+      TAKAHE_CSRF_TRUSTED_ORIGINS: '["http://127.0.0.1:8000", "https://127.0.0.1:8000"]'
+      TAKAHE_USE_PROXY_HEADERS: true
+      TAKAHE_EMAIL_BACKEND: "console://console"
+      TAKAHE_MAIN_DOMAIN: "example.com"
+      TAKAHE_ENVIRONMENT: "development"
     networks:
       - external_network
       - internal_network
-- 
cgit v1.2.3