From 908413973ce1af7308cd0de340c5338d6ac3d19d Mon Sep 17 00:00:00 2001
From: Yanick Minder <minder@puzzle.ch>
Date: Tue, 15 Oct 2024 13:54:49 +0200
Subject: [PATCH] complete auto restart of container

---
 docker/local-prod/docker-compose.yml    | 20 ++++++++++++++++++--
 docker/local-prod/local-prod.Dockerfile |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/docker/local-prod/docker-compose.yml b/docker/local-prod/docker-compose.yml
index cda96d4597..aa47eee5d7 100644
--- a/docker/local-prod/docker-compose.yml
+++ b/docker/local-prod/docker-compose.yml
@@ -14,16 +14,32 @@ services:
     volumes:
         - ../../../okr/backend/target:/app-root/backend
     network_mode: "host"
+    depends_on:
+      maven-init:
+        condition: service_completed_successfully
 
   maven:
     tty: true
     container_name: maven
     restart: on-failure
     image: maven:3.9.9-amazoncorretto-21
-    command: sh -c "mvn -B clean package -P build-for-docker,debug && mvn fizzed-watcher:run"
+    command: mvn fizzed-watcher:run
     working_dir: /app-root/
     volumes:
-      - ../../../okr:/app-root/
+      - ../../../okr:/app-root
+      - ~/.m2/repository:/root/.m2/repository
+    depends_on:
+      maven-init:
+        condition: service_completed_successfully
+
+  maven-init:
+    tty: true
+    container_name: maven-init
+    image: maven:3.9.9-amazoncorretto-21
+    command: mvn -B clean package -P build-for-docker,debug
+    working_dir: /app-root/
+    volumes:
+      - ../../../okr:/app-root
       - ~/.m2/repository:/root/.m2/repository
 
   angular:
diff --git a/docker/local-prod/local-prod.Dockerfile b/docker/local-prod/local-prod.Dockerfile
index 065a25d5b6..bc09dedf3b 100644
--- a/docker/local-prod/local-prod.Dockerfile
+++ b/docker/local-prod/local-prod.Dockerfile
@@ -9,4 +9,4 @@ USER 1001
 
 WORKDIR app-root/backend
 
-ENTRYPOINT ["/bin/sh", "-c", "pwd; export BACKEND_VERSION=$(find . -type f -name 'backend-*.jar' -print -quit | sed -n 's/.*backend-\\(.*\\)\\.jar/\\1/p'); while true; do [ -f \"backend-${BACKEND_VERSION}.jar\" ] && (java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 -jar backend-${BACKEND_VERSION}.jar & pid=$!; inotifywait -e modify backend-${BACKEND_VERSION}.jar; kill -9 $pid; echo 'JAR updated. Restarting...') || echo \"File backend-${BACKEND_VERSION}.jar does not exist.\"; done"]
\ No newline at end of file
+ENTRYPOINT ["/bin/sh", "-c", "export BACKEND_VERSION=$(find . -type f -name 'backend-*.jar' -print -quit | sed -n 's/.*backend-\\(.*\\)\\.jar/\\1/p'); while true; do java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005 -jar backend-${BACKEND_VERSION}.jar  & pid=$!; inotifywait -e modify backend-${BACKEND_VERSION}.jar; exit 1; done"]
\ No newline at end of file