Skip to content

Commit

Permalink
2.1 may not be ready. Email settings have moved to the base container
Browse files Browse the repository at this point in the history
  • Loading branch information
abztrakt committed Feb 8, 2024
1 parent e407e90 commit 46cfd7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DJANGO_CONTAINER_VERSION=2.0.1
ARG DJANGO_CONTAINER_VERSION=1.4.2

FROM us-docker.pkg.dev/uwit-mci-axdd/containers/django-container:${DJANGO_CONTAINER_VERSION} as app-container

Expand Down
11 changes: 3 additions & 8 deletions docker/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,17 @@
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'

if DEBUG:
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
# EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
MEDIA_ROOT = "/app/data/"
MEDIA_URL = "/media/"
else:
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
#else:
# EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"

RESTCLIENTS_MDOT_DAO_CLASS = os.getenv("RESTCLIENTS_MDOT_DAO_CLASS", "Mock")
RESTCLIENTS_MDOT_HOST = os.getenv("RESTCLIENTS_MDOT_HOST", None)
RESTCLIENTS_CA_BUNDLE = '/etc/ssl/certs/ca-certificates.crt'

EMAIL_HOST = os.getenv("EMAIL_HOST")
EMAIL_PORT = 587
EMAIL_TIMEOUT = 15
EMAIL_USE_TLS = True
EMAIL_SSL_CERTFILE = os.getenv("CERT_PATH", "")
EMAIL_SSL_KEYFILE = os.getenv("KEY_PATH", "")

MDOT_HELP_EMAIL = os.getenv(
"MDOT_HELP_EMAIL", "[email protected]"
Expand Down

0 comments on commit 46cfd7f

Please sign in to comment.