Skip to content

Commit

Permalink
fin
Browse files Browse the repository at this point in the history
  • Loading branch information
Ellie010707 committed Sep 28, 2022
1 parent eb23776 commit 4b69881
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 33 deletions.
30 changes: 12 additions & 18 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,21 @@

from datetime import timedelta

env = environ.Env(
# set casting, default value
DEBUG=(bool, False)
)
is_dev = False

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent

environ.Env.read_env(
env_file=os.path.join(BASE_DIR, '.env')
)
env = environ.Env(DEBUG=(bool, True))

if is_dev:
environ.Env.read_env(
env_file=os.path.join(BASE_DIR, 'dev.env')
)
else:
environ.Env.read_env(
env_file=os.path.join(BASE_DIR, '.env')
)

# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
Expand Down Expand Up @@ -125,17 +129,7 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql', # engine: mysql
'NAME' : 'lmdb', # DB Name
'USER' : 'admin', # DB User
'PASSWORD' : 'admin-letterman', # Password
'HOST': 'letterman.coqequ5e3jft.ap-northeast-2.rds.amazonaws.com', # 생성한 데이터베이스 엔드포인트
'PORT': '3307', # 데이터베이스 포트
'OPTIONS':{
'init_command' : "SET sql_mode='STRICT_TRANS_TABLES'"
}
}
'default': env.db(),
}


Expand Down
15 changes: 0 additions & 15 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,6 @@
version: "3"

services:
# docker-compose.yml 파일이 밖에 있을 때 기준
# frontend:
# build:
# context: ./frontend
# command: [ "npm", "start" ]
# restart: always
# ports:
# - 3000:3000
# # networks:
# # -
# volumes:
# - ./frontend/:/frontend
# - ./frontend/node_modules/:/frontend/node_modules
# tty: true

db:
container_name: mysqldb
image: mysql:latest
Expand Down
Binary file added prometheus/queries.active
Binary file not shown.
Binary file added prometheus/wal/00000000
Binary file not shown.
Binary file added prometheus/wal/00000001
Binary file not shown.
Binary file added prometheus/wal/00000002
Binary file not shown.

0 comments on commit 4b69881

Please sign in to comment.