From dc11821f91342fb3528aee85eac42235dc6865bc Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 4 May 2026 22:15:29 +0300 Subject: [PATCH] matrix-ketesa: 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) --- roles/custom/matrix-ketesa/defaults/main.yml | 1 - .../matrix-ketesa/tasks/setup_install.yml | 21 ++++++++----------- .../matrix-ketesa/tasks/validate_config.yml | 3 ++- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/roles/custom/matrix-ketesa/defaults/main.yml b/roles/custom/matrix-ketesa/defaults/main.yml index 4db067f8b..87096d767 100644 --- a/roles/custom/matrix-ketesa/defaults/main.yml +++ b/roles/custom/matrix-ketesa/defaults/main.yml @@ -32,7 +32,6 @@ matrix_ketesa_container_image: "{{ matrix_ketesa_container_image_registry_prefix matrix_ketesa_container_image_registry_prefix: "{{ 'localhost/' if matrix_ketesa_container_image_self_build else matrix_ketesa_container_image_registry_prefix_upstream }}" matrix_ketesa_container_image_registry_prefix_upstream: "{{ matrix_ketesa_container_image_registry_prefix_upstream_default }}" matrix_ketesa_container_image_registry_prefix_upstream_default: "ghcr.io/" -matrix_ketesa_container_image_force_pull: "{{ matrix_ketesa_container_image.endswith(':latest') }}" # The base container network matrix_ketesa_container_network: matrix-ketesa diff --git a/roles/custom/matrix-ketesa/tasks/setup_install.yml b/roles/custom/matrix-ketesa/tasks/setup_install.yml index 58f130a29..ac6970862 100644 --- a/roles/custom/matrix-ketesa/tasks/setup_install.yml +++ b/roles/custom/matrix-ketesa/tasks/setup_install.yml @@ -71,11 +71,9 @@ register: matrix_ketesa_config_result - name: Ensure matrix-ketesa image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_ketesa_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_ketesa_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_ketesa_container_image_force_pull }}" + pull: always when: not matrix_ketesa_container_image_self_build | bool register: matrix_ketesa_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -94,16 +92,14 @@ when: matrix_ketesa_container_image_self_build | bool - name: Ensure matrix-ketesa Docker image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_ketesa_container_image }}" - source: build - force_source: "{{ matrix_ketesa_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_ketesa_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_ketesa_container_src_files_path }}" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_ketesa_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_ketesa_git_pull_results.changed | bool else 'never' }}" when: matrix_ketesa_container_image_self_build | bool + register: matrix_ketesa_container_image_build_result - name: Ensure matrix-ketesa container network is created community.general.docker_network: @@ -127,4 +123,5 @@ or matrix_ketesa_config_result.changed | default(false) or matrix_ketesa_systemd_service_result.changed | default(false) or matrix_ketesa_container_image_pull_result.changed | default(false) + or matrix_ketesa_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-ketesa/tasks/validate_config.yml b/roles/custom/matrix-ketesa/tasks/validate_config.yml index 1f63e1463..d4f12cd9e 100644 --- a/roles/custom/matrix-ketesa/tasks/validate_config.yml +++ b/roles/custom/matrix-ketesa/tasks/validate_config.yml @@ -31,11 +31,12 @@ - {'old': 'matrix_synapse_admin_nginx_proxy_integration_enabled', 'new': ''} - {'old': 'matrix_synapse_admin_docker_image_name_prefix', 'new': 'matrix_ketesa_container_image_registry_prefix'} - {'old': 'matrix_synapse_admin_docker_image', 'new': 'matrix_ketesa_container_image'} - - {'old': 'matrix_synapse_admin_docker_image_force_pull', 'new': 'matrix_ketesa_container_image_force_pull'} + - {'old': 'matrix_synapse_admin_docker_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - {'old': 'matrix_synapse_admin_docker_image_registry_prefix', 'new': 'matrix_ketesa_container_image_registry_prefix'} - {'old': 'matrix_synapse_admin_docker_image_registry_prefix_upstream', 'new': 'matrix_ketesa_container_image_registry_prefix_upstream'} - {'old': 'matrix_synapse_admin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_ketesa_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_synapse_admin_docker_src_files_path', 'new': 'matrix_ketesa_container_src_files_path'} + - {'old': 'matrix_ketesa_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - when: matrix_ketesa_container_labels_traefik_enabled | bool block: