From 0e7cf355bf8f5da54653fe874cbe6fe28228a84a Mon Sep 17 00:00:00 2001 From: Ishaan Mittal Date: Thu, 28 Dec 2023 14:24:29 +0530 Subject: [PATCH] resolving conflicts with the server --- Dockerfile | 2 +- home/utils/django_email_server.py | 2 +- messWebsite/settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4cf80a..ce34085 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10 +FROM python:3.11 ENV PYTHONUNBUFFERED 1 diff --git a/home/utils/django_email_server.py b/home/utils/django_email_server.py index c950c24..41b926b 100644 --- a/home/utils/django_email_server.py +++ b/home/utils/django_email_server.py @@ -57,7 +57,7 @@ def send_html(subject, message, recipient): message_long_rebate_query = """ Dear Student, Your long term rebate application from {start_date} to {end_date} has been recieved but contains some issues. -Kindly send your long rebate application photograph as a reply to this mail itself itself. +Kindly send your long rebate application photograph as a reply to this mail itself. """ diff --git a/messWebsite/settings.py b/messWebsite/settings.py index 96b89df..ef361da 100644 --- a/messWebsite/settings.py +++ b/messWebsite/settings.py @@ -193,9 +193,9 @@ DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.RawMediaCloudinaryStorage' DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage' -# MEDIA_ROOT = os.path.join(BASE_DIR, 'media/') MEDIA_URL= '/media/' + # Default primary key field type # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field