fix: correct Collabora discovery URL formatting and improve container readiness check logic

This commit is contained in:
martin.fencl
2026-08-06 18:15:37 +02:00
parent 33492bb642
commit 238b5b4723
+8 -10
View File
@@ -18,8 +18,7 @@
nextcloud_local_status_url: "http://127.0.0.1:8080/status.php" nextcloud_local_status_url: "http://127.0.0.1:8080/status.php"
collabora_url: "https://collabora.martinfencl.eu/" collabora_url: "https://collabora.martinfencl.eu/"
collabora_discovery_url: >- collabora_discovery_url: "https://collabora.martinfencl.eu/hosting/discovery"
https://collabora.martinfencl.eu/hosting/discovery
vm_commands: vm_commands:
- name: Run Nextcloud cron - name: Run Nextcloud cron
@@ -48,21 +47,20 @@
- name: Check required containers - name: Check required containers
command: >- command: >-
set -o pipefail;
for container in for container in
{{ nextcloud_container | quote }} {{ nextcloud_container | quote }}
{{ nextcloud_db_container | quote }} {{ nextcloud_db_container | quote }}
{{ redis_container | quote }}; {{ redis_container | quote }};
do do
docker ps state="$(
--filter "name=^/${container}$" docker inspect
--filter "status=running" --format '{% raw %}{{.State.Running}}{% endraw %}'
--format '{% raw %}{{.Names}}{% endraw %}' "${container}" 2>/dev/null
| grep -qx "${container}" )";
|| { if [ "${state}" != "true" ]; then
echo "Container ${container} is not running" >&2; echo "Container ${container} is not running" >&2;
exit 1; exit 1;
}; fi;
done done
- name: Check MariaDB readiness - name: Check MariaDB readiness