From cbaff834ac19009f3d46cf65cf564487668bf945 Mon Sep 17 00:00:00 2001 From: Seigi Takada Date: Wed, 19 Jul 2023 09:17:24 +0800 Subject: [PATCH] Add db user and name to env variable --- core/settings.py | 4 ++-- docker-compose.prod.yml | 2 ++ docker-compose.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/settings.py b/core/settings.py index ec7abb4f1..7c8edad72 100644 --- a/core/settings.py +++ b/core/settings.py @@ -184,8 +184,8 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'NAME': os.environ.get('DB', 'postgres'), - 'USER': 'postgres', + 'NAME': os.environ.get('DB_DATABASE', 'postgres'), + 'USER': os.environ.get('DB_USER', 'postgres'), 'PASSWORD': os.environ.get('DB_PASSWORD', 'Postgres123'), 'HOST': os.environ.get('DB_HOST', 'db'), 'PORT': os.environ.get('DB_PORT', 5432), diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 210f5d6ea..a16fa5ee8 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -29,6 +29,8 @@ services: - REDIS_PORT=${REDIS_PORT-6379} - DB_HOST=${DB_HOST-db} - DB_PORT=${DB_PORT-5432} + - DB_DATABASE=${DB_DATABASE-postgres_db} + - DB_USER=${DB_USER-postgres} - DB_PASSWORD=${DB_PASSWORD-Postgres123} - ES_HOSTS=${ES_HOSTS-es:9200} - ENVIRONMENT=production diff --git a/docker-compose.yml b/docker-compose.yml index 208bb977a..10386b58b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,6 +33,8 @@ services: - REDIS_PORT=${REDIS_PORT-6379} - DB_HOST=${DB_HOST-db} - DB_PORT=${DB_PORT-5432} + - DB_DATABASE=${DB_DATABASE-postgres} + - DB_USER=${DB_USER-postgres} - DB_PASSWORD=${DB_PASSWORD-Postgres123} - ES_HOSTS=${ES_HOSTS-es:9200} - ENVIRONMENT=${ENVIRONMENT-production}