IM/ansible_fencl
3
0
Fork 0
forked from jakub/ansible
Code Pull Requests Activity

Refactor update_collabora.yml: remove unnecessary comments and streamline Docker command execution with a prefix for better compatibility

Browse Source
This commit is contained in:
fencl
2025-10-05 09:30:22 +02:00
parent 4dd4b3b6f7
commit 866abc3d83
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nextcloud/update_collabora.yml
View File

@@ -1,9 +1,3 @@
# """
# Update Collabora CODE container on VM via Proxmox.
#
# :return: RunResultType
# """
- name: Update Collabora CODE on VM via Proxmox - name: Update Collabora CODE on VM via Proxmox
hosts: proxmox hosts: proxmox
gather_facts: false gather_facts: false
@@ -15,17 +9,18 @@
vm_ip: "{{ lookup('env', 'VM_IP') }}" vm_ip: "{{ lookup('env', 'VM_IP') }}"
vm_user: "{{ lookup('env', 'VM_USER') }}" vm_user: "{{ lookup('env', 'VM_USER') }}"
vm_pass: "{{ lookup('env', 'VM_PASS') }}" vm_pass: "{{ lookup('env', 'VM_PASS') }}"
# Flip to true if Docker needs sudo on the VM
use_sudo: false use_sudo: false
collabora_project: "nextcloud-collabora" collabora_project: "nextcloud-collabora"
collabora_compose_file: "/data/compose/nextcloud/collabora-only.yml" 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: collabora_commands:
- "docker pull collabora/code:latest" - "{{ docker_prefix }} pull -q collabora/code:latest >/dev/null"
- "docker compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull collabora" - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} pull collabora >/dev/null"
- "docker compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate collabora" - "{{ docker_prefix }} compose -p {{ collabora_project }} -f {{ collabora_compose_file }} up -d --no-deps --force-recreate collabora >/dev/null"
tasks: tasks:
- name: Ensure sshpass is installed (for password-based SSH) # English comments - name: Ensure sshpass is installed (for password-based SSH) # English comments
@@ -69,4 +64,4 @@
that: "item.rc == 0" that: "item.rc == 0"
fail_msg: "Collabora update failed on VM: {{ item.item }} (rc={{ item.rc }})" fail_msg: "Collabora update failed on VM: {{ item.item }} (rc={{ item.rc }})"
success_msg: "All Collabora update commands succeeded." success_msg: "All Collabora update commands succeeded."
loop: "{{ collab_cmds.results }}" loop: "{{ collab_cmds.results }}"