Merge pull request #503 from GunGonGamLee/502-build-cloud-platform에-있…

…던-db를-가상환경으로-migrate Build: Cloud platform DB를 Docker 환경으로 migration
GunGonGamLee · Mar 25, 2024 · 34d9e53 · 34d9e53
2 parents f0caa71 + 6fd8966
commit 34d9e53
Show file tree

Hide file tree

Showing 19 changed files with 175 additions and 483 deletions.
diff --git a/backend/friends/migrations/0001_initial.py b/backend/friends/migrations/0001_initial.py
diff --git a/backend/games/migrations/0001_initial.py b/backend/games/migrations/0001_initial.py
diff --git a/backend/games/migrations/0002_game_started_at.py b/backend/games/migrations/0002_game_started_at.py
diff --git a/backend/games/migrations/0003_casualgamelistview.py b/backend/games/migrations/0003_casualgamelistview.py
diff --git a/backend/src/settings.py b/backend/src/settings.py
@@ -31,8 +31,8 @@ def wait_for_vault_client(client, retries=5, delay=5):
 if DEBUG:
     # DB
     DB_HOST = config('DB_HOST')
-    DB_PASSWORD = config('DB_PASSWORD')
-    DB_USER = config('DB_USER')
+    POSTGRES_PASSWORD = config('POSTGRES_PASSWORD')
+    POSTGRES_USER = config('POSTGRES_USER')
     DB_DATABASE = config('DB_DATABASE')
     DB_PORT = config('DB_PORT')
 
@@ -175,11 +175,11 @@ def wait_for_vault_client(client, retries=5, delay=5):
     'django_prometheus',
 ]
 
-ELASTICSEARCH_DSL = {
-    'default': {
-        'hosts': 'localhost:9200'
-    },
-}
+# ELASTICSEARCH_DSL = {
+#     'default': {
+#         'hosts': 'localhost:9200'
+#     },
+# }
 
 AUTH_USER_MODEL = 'users.User'
 
@@ -230,9 +230,9 @@ def wait_for_vault_client(client, retries=5, delay=5):
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql',
-            'NAME': env('DB_DATABASE'),
-            'USER': env('DB_USER'),
-            'PASSWORD': env('DB_PASSWORD'),
+            'NAME': 'db_name',
+            'USER': env('POSTGRES_USER'),
+            'PASSWORD': env('POSTGRES_PASSWORD'),
             'HOST': env('DB_HOST'),
             'PORT': env('DB_PORT'),
         }
@@ -241,11 +241,11 @@ def wait_for_vault_client(client, retries=5, delay=5):
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql',
-            'NAME': db_name,
-            'USER': db_user,
-            'PASSWORD': db_password,
-            'HOST': db_host,
-            'PORT': db_port,
+            'NAME': 'db_name',
+            'USER': env('POSTGRES_USER'),
+            'PASSWORD': env('POSTGRES_PASSWORD'),
+            'HOST': env('DB_HOST'),
+            'PORT': env('DB_PORT'),
         }
     }
 

diff --git a/backend/users/migrations/0001_initial.py b/backend/users/migrations/0001_initial.py
diff --git a/backend/users/migrations/0002_user_is_online.py b/backend/users/migrations/0002_user_is_online.py
diff --git a/backend/users/migrations/0003_user_custom_1vs1_wins_user_custom_tournament_wins_and_more.py b/backend/users/migrations/0003_user_custom_1vs1_wins_user_custom_tournament_wins_and_more.py
diff --git a/backend/users/migrations/0004_alter_user_avatar.py b/backend/users/migrations/0004_alter_user_avatar.py
diff --git a/backend/users/migrations/0005_alter_user_avatar.py b/backend/users/migrations/0005_alter_user_avatar.py
diff --git a/backend/users/migrations/0006_alter_user_avatar.py b/backend/users/migrations/0006_alter_user_avatar.py
diff --git a/backend/users/migrations/0007_alter_user_avatar.py b/backend/users/migrations/0007_alter_user_avatar.py