feat: load environment variables from .env file and update config loading logic
This commit is contained in:
parent
5fa0734c66
commit
5ffd3423ff
7
.github/dependabot.yml
vendored
Normal file
7
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "pip"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
|
timezone: "Asia/Shanghai"
|
||||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -184,4 +184,6 @@ data
|
|||||||
.dev
|
.dev
|
||||||
poetry.lock
|
poetry.lock
|
||||||
apps/setting/models_provider/impl/*/icon/
|
apps/setting/models_provider/impl/*/icon/
|
||||||
tmp/
|
tmp/
|
||||||
|
config.yml
|
||||||
|
config.yml
|
||||||
@ -2,6 +2,8 @@
|
|||||||
#
|
#
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from dotenv import load_dotenv
|
||||||
|
|
||||||
from .conf import ConfigManager
|
from .conf import ConfigManager
|
||||||
|
|
||||||
__all__ = ['BASE_DIR', 'PROJECT_DIR', 'VERSION', 'CONFIG']
|
__all__ = ['BASE_DIR', 'PROJECT_DIR', 'VERSION', 'CONFIG']
|
||||||
@ -9,4 +11,12 @@ __all__ = ['BASE_DIR', 'PROJECT_DIR', 'VERSION', 'CONFIG']
|
|||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
PROJECT_DIR = os.path.dirname(BASE_DIR)
|
PROJECT_DIR = os.path.dirname(BASE_DIR)
|
||||||
VERSION = '2.0.0'
|
VERSION = '2.0.0'
|
||||||
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
|
|
||||||
|
# load environment variables from .env file
|
||||||
|
load_dotenv()
|
||||||
|
# print(os.getenv('MAXKB_CONFIG'))
|
||||||
|
if os.getenv('MAXKB_CONFIG') is not None:
|
||||||
|
CONFIG = ConfigManager.load_user_config(root_path=PROJECT_DIR)
|
||||||
|
else:
|
||||||
|
CONFIG = ConfigManager.load_user_config(root_path=os.path.abspath('/opt/maxkb/conf'))
|
||||||
|
|
||||||
|
|||||||
@ -7,12 +7,12 @@ readme = "README.md"
|
|||||||
|
|
||||||
[tool.poetry.dependencies]
|
[tool.poetry.dependencies]
|
||||||
python = "^3.11"
|
python = "^3.11"
|
||||||
django = "^5.2"
|
django = "5.2"
|
||||||
drf-spectacular = { extras = ["sidecar"], version = "^0.28.0" }
|
drf-spectacular = { extras = ["sidecar"], version = "0.28.0" }
|
||||||
django-redis = "^5.4.0"
|
django-redis = "5.4.0"
|
||||||
django-db-connection-pool = "^1.2.5"
|
django-db-connection-pool = "1.2.5"
|
||||||
psycopg = {extras = ["binary"], version = "^3.2.6"}
|
psycopg = {extras = ["binary"], version = "3.2.6"}
|
||||||
|
python-dotenv = "1.1.0"
|
||||||
|
|
||||||
[build-system]
|
[build-system]
|
||||||
requires = ["poetry-core"]
|
requires = ["poetry-core"]
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user