From 866abc3d836c0af7f2c6afed4506aa880413d882 Mon Sep 17 00:00:00 2001 From: fencl Date: Sun, 5 Oct 2025 09:30:22 +0200 Subject: [PATCH] Refactor update_collabora.yml: remove unnecessary comments and streamline Docker command execution with a prefix for better compatibility --- nextcloud/update_collabora.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/nextcloud/update_collabora.yml b/nextcloud/update_collabora.yml index fb71321..2fa8689 100644 --- a/nextcloud/update_collabora.yml +++ b/nextcloud/update_collabora.yml @@ -1,9 +1,3 @@ -# """ -# Update Collabora CODE container on VM via Proxmox. -# -# :return: RunResultType -# """ - - name: Update Collabora CODE on VM via Proxmox hosts: proxmox gather_facts: false @@ -15,17 +9,18 @@ vm_ip: "{{ lookup('env', 'VM_IP') }}" vm_user: "{{ lookup('env', 'VM_USER') }}" vm_pass: "{{ lookup('env', 'VM_PASS') }}" - - # Flip to true if Docker needs sudo on the VM use_sudo: false collabora_project: "nextcloud-collabora" collabora_compose_file: "/data/compose/nextcloud/collabora-only.yml" + # English comments: prefix ensures we bypass aliases/functions and use real docker + docker_prefix: "unalias docker 2>/dev/null || true; DOCKER_CLI_HINTS=0; command docker" + collabora_commands: - - "docker pull collabora/code:latest" - - "docker compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull collabora" - - "docker compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate collabora" + - "{{ docker_prefix }} pull -q collabora/code:latest >/dev/null" + - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull collabora >/dev/null" + - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate collabora >/dev/null" tasks: - name: Ensure sshpass is installed (for password-based SSH) # English comments @@ -69,4 +64,4 @@ that: "item.rc == 0" fail_msg: "Collabora update failed on VM: {{ item.item }} (rc={{ item.rc }})" success_msg: "All Collabora update commands succeeded." - loop: "{{ collab_cmds.results }}" + loop: "{{ collab_cmds.results }}" \ No newline at end of file