diff --git a/.github/workflows/mariadb.yaml b/.github/workflows/mariadb.yaml index 576a6d0111..5455468b2e 100644 --- a/.github/workflows/mariadb.yaml +++ b/.github/workflows/mariadb.yaml @@ -10,6 +10,7 @@ jobs: env: # Database backend configuration INVENTREE_DB_ENGINE: django.db.backends.mysql + INVENTREE_DB_NAME: inventree INVENTREE_DB_USER: root INVENTREE_DB_PASSWORD: password INVENTREE_DB_HOST: '127.0.0.1' diff --git a/.github/workflows/mysql.yaml b/.github/workflows/mysql.yaml index 7f741bf35e..b4a1ff9e68 100644 --- a/.github/workflows/mysql.yaml +++ b/.github/workflows/mysql.yaml @@ -12,6 +12,7 @@ jobs: env: # Database backend configuration INVENTREE_DB_ENGINE: django.db.backends.mysql + INVENTREE_DB_NAME: inventree INVENTREE_DB_USER: root INVENTREE_DB_PASSWORD: password INVENTREE_DB_HOST: '127.0.0.1' diff --git a/.github/workflows/postgresql.yaml b/.github/workflows/postgresql.yaml index ced38ec8a6..aab05205cc 100644 --- a/.github/workflows/postgresql.yaml +++ b/.github/workflows/postgresql.yaml @@ -12,6 +12,7 @@ jobs: env: # Database backend configuration INVENTREE_DB_ENGINE: django.db.backends.postgresql + INVENTREE_DB_NAME: inventree INVENTREE_DB_USER: inventree INVENTREE_DB_PASSWORD: password INVENTREE_DB_HOST: '127.0.0.1' diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index c0397961cf..d941de969c 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -333,10 +333,6 @@ db_config = CONFIG.get('database', {}) # Environment variables take preference over config file! -# If a particular database option is not specified in the config file, -# look for it in the environmental variables -# e.g. INVENTREE_DB_NAME / INVENTREE_DB_USER / etc - db_keys = ['ENGINE', 'NAME', 'USER', 'PASSWORD', 'HOST', 'PORT'] for key in db_keys: @@ -380,9 +376,9 @@ db_host = db_config.get('HOST', "''") print("InvenTree Database Configuration") print("================================") -print(f"INVENTREE_DB_ENGINE: {db_engine}") -print(f"INVENTREE_DB_NAME: {db_name}") -print(f"INVENTREE_DB_HOST: {db_host}") +print(f"ENGINE: {db_engine}") +print(f"NAME: {db_name}") +print(f"HOST: {db_host}") DATABASES['default'] = db_config