From 8cb5fd31799f85ca1ffb25a51f73fec15b387668 Mon Sep 17 00:00:00 2001
From: Prafful Sharma <115104695+DraKen0009@users.noreply.github.com>
Date: Thu, 28 Nov 2024 19:45:54 +0530
Subject: [PATCH 1/3] fixed dockerfile for local plugin installation (#2622)

fixed DockerFile for local plugin installation
---
 docker/dev.Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docker/dev.Dockerfile b/docker/dev.Dockerfile
index 17d5c8df59..9bbb9e492a 100644
--- a/docker/dev.Dockerfile
+++ b/docker/dev.Dockerfile
@@ -37,12 +37,10 @@ RUN python -m venv /.venv
 COPY Pipfile Pipfile.lock $APP_HOME/
 RUN --mount=type=cache,target=/root/.cache/pip pipenv  install --system --categories "packages dev-packages docs"
 
-COPY plugs/ $APP_HOME/plugs/
-COPY install_plugins.py plug_config.py $APP_HOME/
-RUN --mount=type=cache,target=/root/.cache/pip python3 $APP_HOME/install_plugins.py
-
 COPY . $APP_HOME/
 
+RUN --mount=type=cache,target=/root/.cache/pip python3 $APP_HOME/install_plugins.py
+
 HEALTHCHECK \
   --interval=10s \
   --timeout=5s \

From 907e87a08a502bd911c64183aeed339683b4654b Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Mon, 2 Dec 2024 14:17:57 +0530
Subject: [PATCH 2/3] =?UTF-8?q?Enforce=20`/scripts`=20directory=20uses?=
 =?UTF-8?q?=C2=A0LF=20line=20endings=20on=20all=20systems=20(#2625)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitattributes | 1 +
 README.md      | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 176a458f94..a8d4103c3d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
 * text=auto
+scripts/* text eol=lf
diff --git a/README.md b/README.md
index 8aeaf21375..17455a29ea 100644
--- a/README.md
+++ b/README.md
@@ -60,13 +60,6 @@ to load dummy data for testing run:
 make load-dummy-data
 ```
 
-> [!NOTE]
-> If you are unable to compose up care in windows, ensure line endings are set to `LF` (`docker-entrypoint.sh` won't
-> work with `CRLF` line endings).
-> ```
-> git config core.autocrlf false
-> ```
-
 #### Docker
 
 Prebuilt docker images for server deployments are available

From 9a20757ec16165f32274f9b9ea7f9ec738b0d6ad Mon Sep 17 00:00:00 2001
From: Aakash Singh <mail@singhaakash.dev>
Date: Tue, 3 Dec 2024 11:49:29 +0530
Subject: [PATCH 3/3] Revert healthcheck instruction for compatibility with
 older Docker runtimes (#2630)

Revert helathcheck instruction to work with older docker runtimes
---
 docker/prod.Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker/prod.Dockerfile b/docker/prod.Dockerfile
index ca99cf3767..99f724066f 100644
--- a/docker/prod.Dockerfile
+++ b/docker/prod.Dockerfile
@@ -77,10 +77,9 @@ COPY --chown=django:django . $APP_HOME
 USER django
 
 HEALTHCHECK \
-  --start-period=20s \
-  --start-interval=1s \
   --interval=30s \
   --timeout=5s \
+  --start-period=10s \
   --retries=12 \
   CMD ["./healthcheck.sh"]