From 17a69cc3ff040855e6011878fc007801ab6b8ad3 Mon Sep 17 00:00:00 2001
From: Devinarukula57 <devinarukula57@gmail.com>
Date: Wed, 4 Mar 2026 18:39:32 +0530
Subject: [PATCH] Fix docker configuration and entrypoint setup

---
 Dockerfile         | 3 ++-
 docker-compose.yml | 4 ++--
 entrypoint.sh      | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fc94143b5..f4c1dffad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,6 +56,7 @@ COPY entrypoint.sh /usr/
 
 EXPOSE 8181
 
-RUN chmod +x /usr/entrypoint.sh
+RUN mkdir -p /usr/target
+RUN chmod +x /usr/entrypoint.sh && sed -i 's/\r$//' /usr/entrypoint.sh
 
 ENTRYPOINT [ "/usr/entrypoint.sh" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index a1270dcee..96c55f3cd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     ports:
       - "5436:5436"
     volumes:
-      - $HOME/medplat-temp/data:/var/lib/postgresql/data
+      - ./medplat-temp/data:/var/lib/postgresql/data
       - ./db_init.sh:/docker-entrypoint-initdb.d/db_init.sh
     networks:
       - medplat_net
@@ -25,7 +25,7 @@ services:
     volumes:
       - ./medplat-ui:/usr/ui/medplat-ui
       - ./medplat-web/:/usr/web
-      - $HOME/medplat-temp/.m2:/root/.m2
+      - ./medplat-temp/.m2:/root/.m2
     networks:
       - medplat_net
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 2ee00263c..d0f75e009 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Fix any potential CRLF from the start
+sed -i 's/\r$//' /usr/entrypoint.sh
+
 cd /usr/ui/medplat-ui
 
 npm install --legacy-peer-deps
@@ -8,6 +11,7 @@ bower install
 cd /usr/web
 mvn clean install -P docker -Dmaven.test.skip=true
 
-mv /usr/web/target /usr/target/
+mkdir -p /usr/target/
+cp /usr/web/target/medplat-web-2.0.jar /usr/target/
 cd /usr/target/
-java -jar medplat-web-2.0.jar
+java -jar medplat-web-2.0.jar
\ No newline at end of file