Browse Source

Avoid auto-overwriting sslmode outside of heroku

pull/189/head
Clemens Wolff 5 years ago
parent
commit
e5c935afa4
2 changed files with 4 additions and 1 deletions
  1. 1
      Dockerfile
  2. 4
      app/app/settings.py

1
Dockerfile

@ -33,6 +33,7 @@ RUN pip install --no-cache-dir /deps/*.whl
COPY --from=builder /doccano /doccano
ENV IS_HEROKU="False"
ENV DEBUG="True"
ENV SECRET_KEY="change-me-in-production"
ENV PORT="80"

4
app/app/settings.py

@ -219,7 +219,9 @@ APPLICATION_INSIGHTS = {
'ikey': AZURE_APPINSIGHTS_IKEY if AZURE_APPINSIGHTS_IKEY else None,
}
django_heroku.settings(locals(), test_runner=False)
# work-around for django-heroku: don't overwrite sslmode outside of heroku
if env.bool('IS_HEROKU', True):
django_heroku.settings(locals(), test_runner=False)
# work-around for dj-database-url: explicitly disable ssl for sqlite
if DATABASES['default'].get('ENGINE') == 'django.db.backends.sqlite3':

Loading…
Cancel
Save