fix: Improve pin_compose_app_image script with clearer state tracking and proper build block handling

Web/app.py

@@ -1259,9 +1259,17 @@ def _initialize_scheduler():
         return
     
     try:
-        # For multi-worker Gunicorn, check if we're in a reasonable scenario
-        # Using a lock file to ensure only one instance starts the scheduler
+        # For multi-worker Gunicorn, use a lock file to ensure only one instance starts the scheduler
+        # Clean up any stale lock file from previous runs (older than 5 minutes)
         scheduler_lock_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), '.scheduler_lock')
+        try:
+            if os.path.exists(scheduler_lock_path):
+                lock_age = time.time() - os.path.getmtime(scheduler_lock_path)
+                if lock_age > 300:  # 5 minutes - indicates a stale lock from a previous container run
+                    os.remove(scheduler_lock_path)
+                    app.logger.info(f"Removed stale scheduler lock file (age: {lock_age:.0f}s)")
+        except Exception:
+            pass  # If we can't clean up, continue anyway
         
         try:
             # Try to create the lock file - only succeeds if it doesn't exist

docker-compose-multitenant.yml

@@ -16,8 +16,10 @@ services:
     container_name: inventarsystem-nginx
     restart: unless-stopped
     depends_on:
-      - app
-      - redis
+      app:
+        condition: service_started
+      redis:
+        condition: service_started
     ports:
       - "${INVENTAR_HTTP_PORT:-80}:80"
       - "${INVENTAR_HTTPS_PORT:-443}:443"

docker-compose.yml

@@ -4,7 +4,8 @@ services:
     container_name: inventarsystem-nginx
     restart: unless-stopped
     depends_on:
-      - app
+      app:
+        condition: service_started
     ports:
       - "${INVENTAR_HTTP_PORT:-80}:80"
       - "${INVENTAR_HTTPS_PORT:-443}:443"

install.sh

@@ -68,45 +68,85 @@ with open(compose_file, "r", encoding="utf-8") as f:
     lines = f.readlines()
 
 out = []
-in_app = False
-in_build = False
-image_set = False
+in_app_service = False
+app_indent = None
+app_service_indent = None
+build_found = False
 
-for line in lines:
+def leading_spaces(text):
+    return len(text) - len(text.lstrip(" "))
+
+i = 0
+while i < len(lines):
+    line = lines[i]
     stripped = line.lstrip(" ")
-    indent = len(line) - len(stripped)
+    indent = leading_spaces(line)
 
-    if not in_app and re.match(r"^\s{2}app:\s*$", line):
-        in_app = True
-        image_set = False
+    # Check if we're starting the app service
+    if not in_app_service and re.match(r"^\s*app:\s*$", line):
+        in_app_service = True
+        app_indent = indent
+        app_service_indent = None
+        build_found = False
         out.append(line)
-        out.append(f"    image: {target_image}\n")
-        image_set = True
+        i += 1
         continue
 
-    if in_app:
-        if indent == 2 and re.match(r"^[A-Za-z0-9_-]+:\s*$", stripped):
-            in_app = False
-            in_build = False
+    # Check if we've exited the app service (found another top-level service)
+    if in_app_service and indent <= app_indent and re.match(r"^[A-Za-z0-9_-]+:\s*$", stripped):
+        # We've left the app service - insert image if we haven't already
+        if build_found and app_service_indent is not None:
+            out.append(f"{' ' * app_service_indent}image: {target_image}\n")
+        in_app_service = False
+        out.append(line)
+        i += 1
+        continue
 
-        if in_app:
-            if in_build:
-                if indent > 4:
-                    continue
-                in_build = False
+    # Process lines within the app service
+    if in_app_service:
+        if app_service_indent is None and indent > app_indent:
+            app_service_indent = indent
 
-            if re.match(r"^\s{4}build:\s*$", line):
-                in_build = True
-                continue
+        # Check for image key (already has an image, don't add)
+        if re.match(rf"^\s+image:\s*", line):
+            in_app_service = False
+            out.append(line)
+            i += 1
+            continue
 
-            if re.match(r"^\s{4}image:\s*", line):
-                if image_set:
-                    continue
-                out.append(f"    image: {target_image}\n")
-                image_set = True
-                continue
+        # Check for build block
+        if re.match(rf"^\s+build:\s*$", line):
+            build_found = True
+            out.append(line)
+            i += 1
+            # Skip all lines that are part of the build block (indented more than app_service_indent)
+            while i < len(lines):
+                next_line = lines[i]
+                next_indent = leading_spaces(next_line)
+                if next_indent > app_service_indent and next_line.strip():
+                    out.append(next_line)
+                    i += 1
+                else:
+                    break
+            continue
+
+        # Insert image after build block before first property
+        if build_found and app_service_indent is not None and indent == app_service_indent:
+            # Check if this is a property line (not build)
+            if not re.match(rf"^\s+build:", line):
+                out.append(f"{' ' * app_service_indent}image: {target_image}\n")
+                build_found = False  # Mark that we've inserted the image
+
+        out.append(line)
+        i += 1
+        continue
 
     out.append(line)
+    i += 1
+
+# If we ended while still in the app service, append image at the end
+if in_app_service and build_found and app_service_indent is not None:
+    out.append(f"{' ' * app_service_indent}image: {target_image}\n")
 
 with open(compose_file, "w", encoding="utf-8") as f:
     f.writelines(out)