From cd0dba93fb4b121b2ac3dbbb2c79e454111cc98f Mon Sep 17 00:00:00 2001 From: Jannis Portmann Date: Sat, 8 Apr 2023 12:21:07 +0200 Subject: [PATCH] Use postgres if available --- docker-compose.yml | 4 +++- pflaenzli/pflaenzli_django/settings.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d9af423..ff4a9c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,9 @@ services: ports: - 8080:8888 environment: - DOCKER: True + POSTGRES_PASSWORD: development + POSTGRES_USER: pflaenzli + POSTGRES_DB: pflaenzli db: image: postgres:15 diff --git a/pflaenzli/pflaenzli_django/settings.py b/pflaenzli/pflaenzli_django/settings.py index eec84c4..e92e673 100644 --- a/pflaenzli/pflaenzli_django/settings.py +++ b/pflaenzli/pflaenzli_django/settings.py @@ -85,13 +85,13 @@ WSGI_APPLICATION = "pflaenzli_django.wsgi.application" # Database # https://docs.djangoproject.com/en/4.1/ref/settings/#databases -if os.getenv("DOCKER"): +if os.getenv('POSTGRES_DB') is not None: DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'pflaenzli', - 'USER': 'pflaenzli', - 'PASSWORD': 'development', + 'NAME': os.getenv('POSTGRES_DB'), + 'USER': os.getenv('POSTGRES_USER'), + 'PASSWORD': os.getenv('POSTGRES_PASSWORD'), 'HOST': 'db', 'PORT': '5432', }