From 238b5b4723be710e00dbc91d3d13063485613373 Mon Sep 17 00:00:00 2001
From: "martin.fencl" <martin@martinfencl.eu>
Date: Thu, 6 Aug 2026 18:15:37 +0200
Subject: [PATCH] fix: correct Collabora discovery URL formatting and improve
 container readiness check logic

---
 nextcloud/check_stack_nextcloud.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/nextcloud/check_stack_nextcloud.yml b/nextcloud/check_stack_nextcloud.yml
index 681a012..943c87b 100644
--- a/nextcloud/check_stack_nextcloud.yml
+++ b/nextcloud/check_stack_nextcloud.yml
@@ -18,8 +18,7 @@
     nextcloud_local_status_url: "http://127.0.0.1:8080/status.php"
 
     collabora_url: "https://collabora.martinfencl.eu/"
-    collabora_discovery_url: >-
-      https://collabora.martinfencl.eu/hosting/discovery
+    collabora_discovery_url: "https://collabora.martinfencl.eu/hosting/discovery"
 
     vm_commands:
       - name: Run Nextcloud cron
@@ -48,21 +47,20 @@
 
       - name: Check required containers
         command: >-
-          set -o pipefail;
           for container in
           {{ nextcloud_container | quote }}
           {{ nextcloud_db_container | quote }}
           {{ redis_container | quote }};
           do
-            docker ps
-            --filter "name=^/${container}$"
-            --filter "status=running"
-            --format '{% raw %}{{.Names}}{% endraw %}'
-            | grep -qx "${container}"
-            || {
+            state="$(
+              docker inspect
+              --format '{% raw %}{{.State.Running}}{% endraw %}'
+              "${container}" 2>/dev/null
+            )";
+            if [ "${state}" != "true" ]; then
               echo "Container ${container} is not running" >&2;
               exit 1;
-            };
+            fi;
           done
 
       - name: Check MariaDB readiness