Skip to content

Commit 08d8213

Browse files
committed
postgres var make it consistent w postgres container
1 parent e6d5894 commit 08d8213

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/django.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
DJANGO_SUPERUSER_USERNAME: admin
5151
DJANGO_SUPERUSER_EMAIL: [email protected]
5252
DJANGO_SETTINGS_MODULE: django_channel_tutorial.production
53-
PSQL_NAME: chatdb
54-
PSQL_HOST: 127.0.0.1
55-
PSQL_PORT: 5432
56-
PSQL_USER: postgres
57-
PSQL_PASS: postgres
53+
POSTGRESQL_USER: postgres
54+
POSTGRESQL_PASSWORD: postgres
55+
POSTGRESQL_DATABASE: chatdb
56+
POSTGRESQL_HOST: 127.0.0.1
57+
POSTGRESQL_PORT: 5432
5858
run: |
5959
python manage.py migrate
6060
python manage.py createsuperuser --no-input

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ __pycache__/
33
db.sqlite3
44
db.sqlite3.tortoise
55
env
6+
env2
67
media
78
.vscode
89
.env

django_channel_tutorial/production.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88
DATABASES = {
99
'default': {
1010
'ENGINE': 'django.db.backends.postgresql',
11-
'NAME': os.getenv('PSQL_NAME'),
12-
'USER': os.getenv('PSQL_USER'),
13-
'PASSWORD': os.getenv('PSQL_PASS'),
14-
'HOST': os.getenv('PSQL_HOST'),
15-
'PORT': os.getenv('PSQL_PORT'),
11+
'NAME': os.getenv('POSTGRESQL_DATABASE'),
12+
'USER': os.getenv('POSTGRESQL_USER'),
13+
'PASSWORD': os.getenv('POSTGRESQL_PASSWORD'),
14+
'HOST': os.getenv('POSTGRESQL_HOST'),
15+
'PORT': os.getenv('POSTGRESQL_PORT'),
1616
}
1717
}
1818

1919
TORTOISE_INIT = {
20-
"db_url": f"postgres://{os.getenv('PSQL_USER')}:{os.getenv('PSQL_PASS')}@{os.getenv('PSQL_HOST')}:{os.getenv('PSQL_PORT')}/{os.getenv('PSQL_NAME')}",
20+
"db_url": f"postgres://{os.getenv('POSTGRESQL_USER')}:{os.getenv('POSTGRESQL_PASSWORD')}@{os.getenv('POSTGRESQL_HOST')}:{os.getenv('POSTGRESQL_PORT')}/{os.getenv('POSTGRESQL_DATABASE')}",
2121
"modules" : {
2222
"models": ["chat.tortoise_models"]
2323
}

0 commit comments

Comments
 (0)