From 0d1ff6ad04e58595859a5c6913eb81e04f1f30ac Mon Sep 17 00:00:00 2001 From: Linux User Date: Wed, 24 Apr 2019 11:17:14 +0200 Subject: [PATCH] Fix bool and int env vars --- docker/lama/Dockerfile | 2 +- src/core/docker_settings.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/lama/Dockerfile b/docker/lama/Dockerfile index 8384b1b..3b01d38 100644 --- a/docker/lama/Dockerfile +++ b/docker/lama/Dockerfile @@ -8,4 +8,4 @@ EXPOSE 80 ENTRYPOINT ["python3", "manage.py"] ADD ["src", "/lama"] -CMD ["runserver", "0.0.0.0:80"] \ No newline at end of file +CMD ["runserver", "0.0.0.0:80"] diff --git a/src/core/docker_settings.py b/src/core/docker_settings.py index 615e892..84acdfc 100644 --- a/src/core/docker_settings.py +++ b/src/core/docker_settings.py @@ -18,7 +18,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) DOMAIN = os.environ['DOMAIN'] SITE_NAME = os.environ['SITE_NAME'] SECRET_KEY = os.environ['SECRET_KEY'] -DEBUG = True # bool(os.environ.get('DEBUG', False)) +DEBUG = os.environ.get('DEBUG', 'False') =='TRUE' ALLOWED_HOSTS = os.environ['ALLOWED_HOSTS'].split() # Application definition @@ -175,9 +175,9 @@ else: EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_TIMEOUT = 15 EMAIL_HOST = os.environ['EMAIL_HOST'] - EMAIL_PORT = os.environ['EMAIL_PORT'] - EMAIL_USE_TLS = bool(os.environ.get('EMAIL_USE_TLS', False)) - EMAIL_USE_SSL = bool(os.environ.get('EMAIL_USE_SSL', False)) + EMAIL_PORT = int(os.environ['EMAIL_PORT']) + EMAIL_USE_TLS = os.environ.get('EMAIL_USE_TLS', 'False') == 'TRUE' +# EMAIL_USE_SSL = os.environ.get('EMAIL_USE_SSL', 'False') == 'TRUE' DEFAULT_FROM_EMAIL = os.environ['DEFAULT_FROM_EMAIL'] SERVER_EMAIL = os.environ['SERVER_EMAIL'] @@ -217,5 +217,9 @@ LOGGING = { 'level': 'DEBUG', 'handlers': ['console'], }, + 'django': { + 'handlers': ['console'], + 'level': 'DEBUG', + } }, }