Skip to content

Commit d7f5772

Browse files
committed
Simplify the db config
This was breaking dev environments that were using sqlite See wger-project/docker#158
1 parent e5309a7 commit d7f5772

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

extras/docker/demo/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ ENV PYTHONPATH=/home/wger/src
109109
ENV DJANGO_SETTINGS_MODULE=settings.main
110110
ENV MEDIA_ROOT=/home/wger/media
111111
ENV STATIC_ROOT=/home/wger/static
112+
ENV DJANGO_DB_ENGINE=django.db.backends.sqlite3
112113
ENV DJANGO_DB_DATABASE=/home/wger/db/database.sqlite
113114
ENV DJANGO_CACHE_BACKEND=django.core.cache.backends.locmem.LocMemCache
114115

settings/main.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,15 @@
6363

6464
if os.environ.get('PS_DATABASE_URI'):
6565
DATABASES = {'default': env.db_url('PS_DATABASE_URI')}
66-
elif os.environ.get('DJANGO_DB_ENGINE'):
66+
else:
6767
DATABASES = {
6868
'default': {
6969
'ENGINE': env.str('DJANGO_DB_ENGINE'),
7070
'NAME': env.str('DJANGO_DB_DATABASE'),
71-
'USER': env.str('DJANGO_DB_USER'),
72-
'PASSWORD': env.str('DJANGO_DB_PASSWORD'),
73-
'HOST': env.str('DJANGO_DB_HOST'),
74-
'PORT': env.int('DJANGO_DB_PORT'),
75-
}
76-
}
77-
else:
78-
DATABASES = {
79-
'default': {
80-
'ENGINE': 'django.db.backends.sqlite3',
81-
'NAME': env.str('DJANGO_DB_DATABASE', '/home/wger/db/database.sqlite'),
71+
'USER': env.str('DJANGO_DB_USER', ''),
72+
'PASSWORD': env.str('DJANGO_DB_PASSWORD', ''),
73+
'HOST': env.str('DJANGO_DB_HOST', ''),
74+
'PORT': env.int('DJANGO_DB_PORT', 5432),
8275
}
8376
}
8477
PS_STORAGE_PG_URI = env.str(

0 commit comments

Comments
 (0)