소스 검색

edit enviroment

MolinaFranco 3 년 전
부모
커밋
8adb22ba55
2개의 변경된 파일14개의 추가작업 그리고 10개의 파일을 삭제
  1. 3 4
      app/preports/settings.py
  2. 11 6
      docker-compose.yml

+ 3 - 4
app/preports/settings.py

@@ -76,17 +76,16 @@ WSGI_APPLICATION = 'preports.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 
-DATABASES = {
+DATABASES =  {
     'default': {
-        'NAME': 'p-reports',
+        'NAME': os.getenv("DB_NAME"),
         'ENGINE': 'django.db.backends.postgresql',
-        'USER': 'p-reports',
+        'USER': os.getenv("DB_USER"),
         'PASSWORD': os.getenv("DB_PASSWORD"),
         'HOST': 'db'
     },
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
 

+ 11 - 6
docker-compose.yml

@@ -7,13 +7,18 @@ services:
       dockerfile: ./Dockerfile
     ports:
       - "8080:8000"
-    env_file:
-      - app.env
-    volumes: 
+    environment:
+      - DB_NAME=programmed-reports
+      - DB_USER=user-preports
+      - DB_PASSWORD=pass-preports
+    volumes:
       - ./app:/app
   db:
     image: postgres
-    env_file:
-      - postgres.env
+    environment:
+      - TZ=GMT+3
+      - POSTGRES_DB=programmed-reports
+      - POSTGRES_USER=user-preports
+      - POSTGRES_PASSWORD=pass-preports
     volumes:
-      - ./data/postgres_data:/var/lib/postgresql/data/
+      - ./data/postgres_data:/var/lib/postgresql/data/