Merge branch 'openchatai:main' into main

openchatai · Jan 6, 2024 · bfba963 · bfba963
2 parents 7c18612 + 3c33a28
commit bfba963
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/dj_backend_server/dj_backend_server/settings.py b/dj_backend_server/dj_backend_server/settings.py
@@ -168,15 +168,15 @@
     path.join(BASE_DIR, 'locale'),
 ]
 
-CELERY_BROKER_URL = os.environ.get('CELERY_BROKER_URL', 'redis://localhost:6379/0')
-CELERY_RESULT_BACKEND = os.environ.get('CELERY_RESULT_BACKEND', 'redis://localhost:6379/0')
+CELERY_BROKER_URL = os.environ.get('CELERY_BROKER_URL', 'redis://redis:6379/0')
+CELERY_RESULT_BACKEND = os.environ.get('CELERY_RESULT_BACKEND', 'redis://redis:6379/0')
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': os.environ.get('DATABASE_NAME', 'mydb'),
-        'USER': os.environ.get('DATABASE_USER', 'myuser'),
-        'PASSWORD': os.environ.get('DATABASE_PASSWORD', 'mypassword'),
+        'NAME': os.environ.get('DATABASE_NAME', 'openchat'),
+        'USER': os.environ.get('DATABASE_USER', 'dbuser'),
+        'PASSWORD': os.environ.get('DATABASE_PASSWORD', 'dbpass'),
         'HOST': os.environ.get('DATABASE_HOST', 'mysql'),
         'PORT': os.environ.get('DATABASE_PORT', '3306'),
     }

diff --git a/dj_backend_server/docker-compose.linux.yaml b/dj_backend_server/docker-compose.linux.yaml
@@ -47,7 +47,7 @@ services:
     networks:
       - openchat_network
     env_file:
-      - .env.docker
+      - .env
     depends_on:
       - qdrant
       - mysql
@@ -73,7 +73,7 @@ services:
       redis:
         condition: service_healthy
     env_file:
-      - .env.docker
+      - .env
     entrypoint: ["/entrypoint.sh"]
     command: >
       sh -c "python manage.py migrate auth &&