mirror of
https://github.com/Hopiu/django-model-utils.git
synced 2026-03-16 20:00:23 +00:00
Rename database environment variables to align with the docker postgres image
This commit is contained in:
parent
6e7158bfa0
commit
8677eef1ca
3 changed files with 15 additions and 15 deletions
17
.github/workflows/test.yml
vendored
17
.github/workflows/test.yml
vendored
|
|
@ -3,6 +3,9 @@ name: Test
|
|||
on: [push, pull_request]
|
||||
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: postgres
|
||||
FORCE_COLOR: 1
|
||||
|
||||
jobs:
|
||||
|
|
@ -18,9 +21,9 @@ jobs:
|
|||
postgres:
|
||||
image: postgres:12
|
||||
env:
|
||||
POSTGRES_USER: postgres
|
||||
POSTGRES_PASSWORD: postgres
|
||||
POSTGRES_DB: postgres
|
||||
POSTGRES_USER: ${{ env.POSTGRES_USER }}
|
||||
POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
|
||||
POSTGRES_DB: ${{ env.POSTGRES_DB }}
|
||||
ports:
|
||||
- 5432:5432
|
||||
options: >-
|
||||
|
|
@ -60,11 +63,9 @@ jobs:
|
|||
run: |
|
||||
tox -v -- --cov --cov-append --cov-report term-missing --cov-report xml
|
||||
env:
|
||||
DB_NAME: postgres
|
||||
DB_USER: postgres
|
||||
DB_PASSWORD: postgres
|
||||
DB_HOST: localhost
|
||||
DB_PORT: 5432
|
||||
POSTGRES_DB: ${{ env.POSTGRES_DB }}
|
||||
POSTGRES_USER: ${{ env.POSTGRES_USER }}
|
||||
POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
|
||||
|
||||
- name: Upload coverage
|
||||
uses: codecov/codecov-action@v3
|
||||
|
|
|
|||
|
|
@ -15,14 +15,13 @@ else:
|
|||
DATABASES = {
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.postgresql",
|
||||
"NAME": os.environ.get("DB_NAME", "modelutils"),
|
||||
"USER": os.environ.get("DB_USER", 'postgres'),
|
||||
"PASSWORD": os.environ.get("DB_PASSWORD", ""),
|
||||
"HOST": os.environ.get("DB_HOST", "localhost"),
|
||||
"PORT": os.environ.get("DB_PORT", 5432)
|
||||
"NAME": os.environ.get("POSTGRES_DB", "modelutils"),
|
||||
"USER": os.environ.get("POSTGRES_USER", 'postgres'),
|
||||
"PASSWORD": os.environ.get("POSTGRES_PASSWORD", ""),
|
||||
"HOST": os.environ.get("POSTGRES_HOST", "localhost"),
|
||||
"PORT": os.environ.get("POSTGRES_PORT", 5432)
|
||||
},
|
||||
}
|
||||
|
||||
SECRET_KEY = 'dummy'
|
||||
|
||||
CACHES = {
|
||||
|
|
|
|||
2
tox.ini
2
tox.ini
|
|
@ -36,7 +36,7 @@ passenv =
|
|||
CI
|
||||
FORCE_COLOR
|
||||
GITHUB_*
|
||||
DB_*
|
||||
POSTGRES_*
|
||||
usedevelop = True
|
||||
commands =
|
||||
python -m pytest {posargs}
|
||||
|
|
|
|||
Loading…
Reference in a new issue