From 6e835a10e6fdc466c29dc8f30275ef18d5a965af Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 15 May 2024 11:01:32 +0530
Subject: [PATCH] Fix required changes

---
 Dockerfile       | 13 +++++++------
 requirements.txt |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ec46d16..5a26a1f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get install -y --no-install-recommends libmagic-dev libglib2.0-dev libpa
 ENV VIRTUAL_ENV=/venv
 
 # Use production configuration.
-ENV DJANGO_SETTINGS_MODULE=project.settings
+ENV DJANGO_SETTINGS_MODULE=publichealth.settings
 ENV DJANGO_CONFIGURATION=production
 
 
@@ -29,13 +29,14 @@ ENV \
    # pip:
    PIP_NO_CACHE_DIR=off \
    PIP_DISABLE_PIP_VERSION_CHECK=on \
-   PIP_DEFAULT_TIMEOUT=100 \
+   PIP_DEFAULT_TIMEOUT=100
+
 
 RUN apt-get install -y --no-install-recommends build-essential gcc
 
 # Install python build tools.
-RUN pip install --upgrade pip
-RUN pip install poetry wheel
+RUN pip install --upgrade pip setuptools==58
+RUN pip install wheel
 
 RUN python3 -m venv $VIRTUAL_ENV
 
@@ -57,7 +58,7 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir /app
-RUN cp -r apps project templates manage.py /app/
+RUN cp -r publichealth yarn.lock manage.py /app/
 
 # Collect static data into /app/static.
 RUN . /venv/bin/activate && \
@@ -85,4 +86,4 @@ ENTRYPOINT ["/venv/bin/dumb-init", "--", "gunicorn", \
    "--log-file=-", \
    "--worker-tmp-dir", "/dev/shm", \
    "--workers=2", "--threads=4", "--worker-class=gthread"]
-CMD ["project.wsgi"]
+CMD ["publichealth.wsgi"]
diff --git a/requirements.txt b/requirements.txt
index 7faa249..5e6e6d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,5 +30,5 @@ Pillow==8.4.0
 gunicorn
 whitenoise
 python-dotenv
-ConcurrentLogHandler
+#ConcurrentLogHandler
 unidecode