From caa64562b81b31f2e3dc9cdb51092f7547689189 Mon Sep 17 00:00:00 2001 From: Francisco Sandoval Date: Sat, 3 Jun 2023 17:45:00 -0400 Subject: [PATCH] se agrega variables de entorno en conexion de database --- .gitignore | 3 ++- docker/docker-compose.yml | 7 +++++++ .../project/__pycache__/__init__.cpython-311.pyc | Bin 141 -> 0 bytes .../project/__pycache__/settings.cpython-311.pyc | Bin 2827 -> 0 bytes project/project/__pycache__/urls.cpython-311.pyc | Bin 1323 -> 0 bytes project/project/__pycache__/wsgi.cpython-311.pyc | Bin 663 -> 0 bytes project/project/settings.py | 13 +++++++------ requirements.txt | 3 ++- 8 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 project/project/__pycache__/__init__.cpython-311.pyc delete mode 100644 project/project/__pycache__/settings.cpython-311.pyc delete mode 100644 project/project/__pycache__/urls.cpython-311.pyc delete mode 100644 project/project/__pycache__/wsgi.cpython-311.pyc diff --git a/.gitignore b/.gitignore index ef08971..47185bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /libs .env -.vscode \ No newline at end of file +.vscode +__pycache__ \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 58c25c4..067d4da 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -13,6 +13,13 @@ services: ports: - 4000:8000 command: sh /start.sh + environment: + DBHOST: db + DBPORT: 5432 + DBNAME: database + DBUSER: postgres + DBPASS: password + DBSCHEMA: desarrollo1 db: image: postgres:14-alpine diff --git a/project/project/__pycache__/__init__.cpython-311.pyc b/project/project/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 6622d385abe913d69303ea776412f08689576c2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 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 diff --git a/project/project/__pycache__/wsgi.cpython-311.pyc b/project/project/__pycache__/wsgi.cpython-311.pyc deleted file mode 100644 index 117e8db9ed365ec0efc830ff0214d731fea53c81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 663 zcmY*X&ubGw6n?XtHoCQ;i0#S4PuCP#Y08<&upbo*i*ohw?J<_Ioo6Pu2pZ)t`xnnPkS<x-u1~iiF zfa61sBjj`xB;n1L2qI*((+T33huuJjQgk{7@1pi&s{P|;q<@c~tc z&Oqx}J@Y&!yUJz5K=kEIo7l zVh)=>0_we)CN?2tVwFj00{L_oh;wo~Z)13z{@=%7eReKk^%tzBYi|1J#W~b2pq4^y WTv<;m>*tk?i^|5yQr?m~2K+DEiNKiv diff --git a/project/project/settings.py b/project/project/settings.py index 3853062..20e8ebe 100644 --- a/project/project/settings.py +++ b/project/project/settings.py @@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/4.2/ref/settings/ """ from pathlib import Path +from decouple import config # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -79,13 +80,13 @@ WSGI_APPLICATION = 'project.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql', - 'HOST': 'db', - 'PORT': 5432, - 'USER': 'postgres', - 'PASSWORD': 'password', - 'NAME': 'database', + 'HOST': config('DBHOST', 'localhost'), + 'PORT': config('DBPORT', 5432), + 'USER': config('DBUSER','postgres'), + 'PASSWORD': config('DBPASS','password'), + 'NAME': config('DBNAME','database'), 'OPTIONS': { - 'options': '-c search_path=desarrollo1' + 'options': '-c search_path=' + config('DBSCHEMA', 'public') } } } diff --git a/requirements.txt b/requirements.txt index a6bf869..4115ec0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ django psycopg2-binary djangorestframework -coreapi \ No newline at end of file +coreapi +python-decouple \ No newline at end of file