From 46c8e9010c0157e2ac14f6b23e953a632075974c Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 14 Sep 2023 21:34:29 -0500 Subject: [PATCH] Setup postgres database --- QI/settings.py | 1 + QI/settings_docker.py | 5 +++++ compose-dev.yaml | 9 +++++++++ requirements.txt | 1 + 4 files changed, 16 insertions(+) diff --git a/QI/settings.py b/QI/settings.py index fd9e428..3cf5fba 100644 --- a/QI/settings.py +++ b/QI/settings.py @@ -91,3 +91,4 @@ HAYSTACK_SEARCH_RESULTS_PER_PAGE = 100 +DATABASES = {} \ No newline at end of file diff --git a/QI/settings_docker.py b/QI/settings_docker.py index aa599f1..1e3aead 100644 --- a/QI/settings_docker.py +++ b/QI/settings_docker.py @@ -1,4 +1,5 @@ import os +import dj_database_url from .settings import * @@ -8,6 +9,10 @@ SECRET_KEY = os.environ.get('SECRET_KEY') +DATABASES['default'] = dj_database_url.config( + default='postgres://postgres:pennstreaty@db:5432/postgres' +) + HAYSTACK_CONNECTIONS = { 'default': { 'ENGINE': 'haystack.backends.solr_backend.SolrEngine', diff --git a/compose-dev.yaml b/compose-dev.yaml index d1ca220..d3aaf11 100644 --- a/compose-dev.yaml +++ b/compose-dev.yaml @@ -12,7 +12,16 @@ services: - SECRET_KEY=1 - SOLR_URL=http://solr:8983/solr/pennstreaty depends_on: + - db - solr + db: + image: postgres:15 + volumes: + - ./data/db:/var/lib/postgresql/data + environment: + - POSTGRES_DB=postgres + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=pennstreaty solr: image: solr:9.3 ports: diff --git a/requirements.txt b/requirements.txt index 5ea7102..487f9be 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ certifi==2018.4.16 chardet==3.0.4 click==3.3 diff-match-patch==20121119 +dj-database-url Django==2.0.6 django-autocomplete-light==3.4.0 django-ckeditor==5.7.1