forked from ungleich-public/dynamicweb
Read the database settings from the environment instead of a generated file
This commit is contained in:
parent
6e2dd6b555
commit
0100daf8b9
2 changed files with 5 additions and 14 deletions
|
|
@ -255,7 +255,11 @@ CMS_TEMPLATES = (
|
|||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'app',
|
||||
'NAME': env('POSTGRES_DB', 'app'),
|
||||
'USER': env('POSTGRES_USER', 'app'),
|
||||
'PASSWORD': env('POSTGRES_PASSWORD', 'app'),
|
||||
'HOST': env('POSTGRES_HOST', 'db'),
|
||||
'PORT': env('POSTGRES_PORT', '5432'),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,19 +20,6 @@ if [ -z "${DJANGO_SECRET_KEY:-}" ]; then
|
|||
export DJANGO_SECRET_KEY
|
||||
fi
|
||||
|
||||
cat > dynamicweb/settings/dynamic.py <<PYEOF
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': '${POSTGRES_DB:-app}',
|
||||
'USER': '${POSTGRES_USER:-app}',
|
||||
'PASSWORD': '${POSTGRES_PASSWORD:-app}',
|
||||
'HOST': '${POSTGRES_HOST:-db}',
|
||||
'PORT': '${POSTGRES_PORT:-5432}',
|
||||
}
|
||||
}
|
||||
PYEOF
|
||||
|
||||
# Wait for postgres to accept connections
|
||||
python - <<'PYEOF'
|
||||
import os, socket, sys, time
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue