From e1c26db29ffec478608644c40f51dcaf774bc40d Mon Sep 17 00:00:00 2001 From: Thomas Rusiecki Date: Tue, 18 Feb 2025 20:29:45 -0300 Subject: [PATCH] add postgres config and dependencies --- docker/idhub.Dockerfile | 1 - requirements.txt | 1 + trustchain_idhub/settings.py | 23 ++++++++--------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/docker/idhub.Dockerfile b/docker/idhub.Dockerfile index 5ad7b3e..05b39a4 100644 --- a/docker/idhub.Dockerfile +++ b/docker/idhub.Dockerfile @@ -4,7 +4,6 @@ FROM python:3.11.7-slim-bookworm RUN apt update && \ apt-get install -y \ git \ - sqlite3 \ jq \ libpango-1.0-0 libpangoft2-1.0-0 \ && pip install cffi brotli \ diff --git a/requirements.txt b/requirements.txt index 78e85b1..59e84b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,3 +35,4 @@ pyroaring==0.4.5 coverage==7.4.3 gunicorn==21.2.0 pyvckit +psycopg2-binary==2.9.10 diff --git a/trustchain_idhub/settings.py b/trustchain_idhub/settings.py index 01da39c..975b93a 100644 --- a/trustchain_idhub/settings.py +++ b/trustchain_idhub/settings.py @@ -121,22 +121,15 @@ WSGI_APPLICATION = 'trustchain_idhub.wsgi.application' # Database # https://docs.djangoproject.com/en/4.2/ref/settings/#databases - DATABASES = { - # 'default': { - # 'ENGINE': 'django.db.backends.sqlite3', - # 'NAME': BASE_DIR / 'db.sqlite3', - # } - 'default': config( - 'DATABASE_URL', - default='sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3'), - cast=db_url - ) - # 'default': config( - # 'DATABASE_URL', - # default='sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3'), - # cast=db_url - # ) + 'default': { + 'ENGINE': os.getenv('DB_ENGINE', 'django.db.backends.postgresql'), + 'NAME': os.getenv('IDHUB_DB_NAME', 'idhub'), + 'USER': os.getenv('IDHUB_DB_USER', 'ereuse'), + 'PASSWORD': os.getenv('IDHUB_DB_PASSWORD', 'ereuse'), + 'HOST': os.getenv('IDHUB_DB_HOS', 'idhub-postgres'), + 'PORT': os.getenv('IDHUB_DB_PORT', '5432'), + } }