From a80eac6c724f332e6e74f35a1fbeadddf5fb0a41 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 4 May 2026 22:09:37 +0300 Subject: [PATCH] matrix-cactus-comments: switch to modern community.docker docker_image modules Replaces `community.docker.docker_image` with the modern `docker_image_pull` and `docker_image_build` split modules. Drops the `ansible_version` compatibility ladder and the now-redundant `_container_image_force_pull` variable (the new pull module handles registry refresh natively via `pull: always`). Also registers `_container_image_build_result` so that a self-build rebuild correctly triggers a service restart. Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/5191. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../matrix-cactus-comments/defaults/main.yml | 1 - .../tasks/setup_install.yml | 21 ++++++++----------- .../tasks/validate_config.yml | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/roles/custom/matrix-cactus-comments/defaults/main.yml b/roles/custom/matrix-cactus-comments/defaults/main.yml index dde192bd6..e70629108 100644 --- a/roles/custom/matrix-cactus-comments/defaults/main.yml +++ b/roles/custom/matrix-cactus-comments/defaults/main.yml @@ -38,7 +38,6 @@ matrix_cactus_comments_container_image_registry_prefix: "{{ 'localhost/' if matr matrix_cactus_comments_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_container_image_registry_prefix_upstream_default }}" matrix_cactus_comments_container_image_registry_prefix_upstream_default: docker.io/ matrix_cactus_comments_container_image_tag: "{{ matrix_cactus_comments_version }}" -matrix_cactus_comments_container_image_force_pull: "{{ matrix_cactus_comments_container_image.endswith(':latest') }}" matrix_cactus_comments_container_network: "" diff --git a/roles/custom/matrix-cactus-comments/tasks/setup_install.yml b/roles/custom/matrix-cactus-comments/tasks/setup_install.yml index 2c76c0e1d..e5b47207f 100644 --- a/roles/custom/matrix-cactus-comments/tasks/setup_install.yml +++ b/roles/custom/matrix-cactus-comments/tasks/setup_install.yml @@ -38,11 +38,9 @@ register: matrix_cactus_comments_config_appservice_result - name: Ensure matrix-cactus-comments image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_cactus_comments_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_cactus_comments_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" - force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_cactus_comments_container_image_force_pull }}" + pull: always when: "not matrix_cactus_comments_container_image_self_build | bool" register: matrix_cactus_comments_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -61,16 +59,14 @@ when: "matrix_cactus_comments_container_image_self_build | bool" - name: Ensure matrix-cactus-comments image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_cactus_comments_container_image }}" - source: build - force_source: "{{ matrix_cactus_comments_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" - force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_cactus_comments_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_cactus_comments_container_src_files_path }}" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_cactus_comments_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_cactus_comments_git_pull_results.changed | bool else 'never' }}" when: "matrix_cactus_comments_container_image_self_build | bool" + register: matrix_cactus_comments_container_image_build_result - name: Ensure matrix-cactus-comments.service installed ansible.builtin.template: @@ -87,4 +83,5 @@ or matrix_cactus_comments_config_appservice_result.changed | default(false) or matrix_cactus_comments_systemd_service_result.changed | default(false) or matrix_cactus_comments_container_image_pull_result.changed | default(false) + or matrix_cactus_comments_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-cactus-comments/tasks/validate_config.yml b/roles/custom/matrix-cactus-comments/tasks/validate_config.yml index a5c4d8769..cc9b1a477 100644 --- a/roles/custom/matrix-cactus-comments/tasks/validate_config.yml +++ b/roles/custom/matrix-cactus-comments/tasks/validate_config.yml @@ -28,6 +28,7 @@ - {'old': 'matrix_cactus_comments_docker_repo', 'new': 'matrix_cactus_comments_container_repo'} - {'old': 'matrix_cactus_comments_docker_repo_version', 'new': 'matrix_cactus_comments_container_repo_version'} - {'old': 'matrix_cactus_comments_docker_src_files_path', 'new': 'matrix_cactus_comments_container_src_files_path'} + - {'old': 'matrix_cactus_comments_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Fail if required matrix-cactus-comments settings not defined ansible.builtin.fail: