From c88b94f20f47636899de0e46f67784c5787c7fab Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Thu, 23 May 2024 17:05:21 +0530
Subject: [PATCH] Final changes

---
 Dockerfile | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 81417cf..0fe153f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -61,23 +61,26 @@ COPY . /build
 
 # Copy code required for runtime to the /app folder.
 RUN mkdir -p /app
-RUN cp -r publichealth feedler yarn.lock manage.py /app/
+RUN cp -r publichealth feedler yarn.lock manage.py package.json Gruntfile.js /app/
 
-# node / yarn
-RUN rm -rf node_modules
-RUN yarn install
+
+RUN curl -fsSLO https://deb.nodesource.com/setup_18.x && chmod +x setup_18.x && ./setup_18.x
+RUN apt install -y nodejs
+RUN npm install -g grunt-cli
 
 # Collect static data into /app/static.
-RUN . /venv/bin/activate && \
-   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py collectstatic --no-input -i media
 
-RUN mkdir -p /app/publichealth/static/libs
-RUN ls -al /app/publichealth/static/libs
-RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
+#RUN mkdir -p /app/publichealth/static/libs
+
+#RUN cp -rf node_modules/@bower_components/* /app/publichealth/static/libs
 
 
+#RUN . /venv/bin/activate && \
+#   DJANGO_STATIC_ROOT=/app/static SECRET_KEY=sl DJANGO_SETTINGS_MODULE=publichealth.settings.production ./manage.py compress --force
 
-RUN cp -r /build/static /app/static
+#RUN cp -r /build/static /app/static
 
 ### runtime image