From 28a12776a62ebf7697d701f2049b1c640b9d1f20 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 4 May 2026 21:20:34 +0300 Subject: [PATCH] matrix-corporal: 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) --- .../custom/matrix-corporal/defaults/main.yml | 1 - .../matrix-corporal/tasks/setup_install.yml | 21 ++++++++----------- .../matrix-corporal/tasks/validate_config.yml | 1 + 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/roles/custom/matrix-corporal/defaults/main.yml b/roles/custom/matrix-corporal/defaults/main.yml index e9804bfc9..e33c02cbf 100644 --- a/roles/custom/matrix-corporal/defaults/main.yml +++ b/roles/custom/matrix-corporal/defaults/main.yml @@ -97,7 +97,6 @@ matrix_corporal_container_image_registry_prefix: "{{ 'localhost/' if matrix_corp matrix_corporal_container_image_registry_prefix_upstream: "{{ matrix_corporal_container_image_registry_prefix_upstream_default }}" matrix_corporal_container_image_registry_prefix_upstream_default: ghcr.io/ matrix_corporal_container_image_tag: "{{ matrix_corporal_version }}" # for backward-compatibility -matrix_corporal_container_image_force_pull: "{{ matrix_corporal_container_image.endswith(':latest') }}" matrix_corporal_base_path: "{{ matrix_base_data_path }}/corporal" matrix_corporal_container_src_files_path: "{{ matrix_corporal_base_path }}/container-src" diff --git a/roles/custom/matrix-corporal/tasks/setup_install.yml b/roles/custom/matrix-corporal/tasks/setup_install.yml index 59ed9c44a..0e51e3a6e 100644 --- a/roles/custom/matrix-corporal/tasks/setup_install.yml +++ b/roles/custom/matrix-corporal/tasks/setup_install.yml @@ -36,23 +36,19 @@ when: matrix_corporal_container_image_self_build | bool - name: Ensure Matrix Corporal Docker image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_corporal_container_image }}" - source: build - force_source: "{{ matrix_corporal_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_corporal_git_pull_results.changed }}" - build: - dockerfile: etc/docker/Dockerfile - path: "{{ matrix_corporal_container_src_files_path }}" - pull: true + dockerfile: etc/docker/Dockerfile + path: "{{ matrix_corporal_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_corporal_git_pull_results.changed | bool else 'never' }}" when: matrix_corporal_container_image_self_build | bool + register: matrix_corporal_container_image_build_result - name: Ensure Matrix Corporal Docker image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_corporal_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_corporal_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_corporal_container_image_force_pull }}" + pull: always when: not matrix_corporal_container_image_self_build | bool register: matrix_corporal_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -101,4 +97,5 @@ or matrix_corporal_support_files_result.changed | default(false) or matrix_corporal_systemd_service_result.changed | default(false) or matrix_corporal_container_image_pull_result.changed | default(false) + or matrix_corporal_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-corporal/tasks/validate_config.yml b/roles/custom/matrix-corporal/tasks/validate_config.yml index 86a60252d..774e2b8e0 100644 --- a/roles/custom/matrix-corporal/tasks/validate_config.yml +++ b/roles/custom/matrix-corporal/tasks/validate_config.yml @@ -18,6 +18,7 @@ - {'old': 'matrix_corporal_container_image_name_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'} - {'old': 'matrix_corporal_docker_image', 'new': 'matrix_corporal_container_image'} - {'old': 'matrix_corporal_docker_image_force_pull', 'new': 'matrix_corporal_container_image_force_pull'} + - {'old': 'matrix_corporal_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - {'old': 'matrix_corporal_docker_image_registry_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'} - {'old': 'matrix_corporal_docker_image_registry_prefix_upstream', 'new': 'matrix_corporal_container_image_registry_prefix_upstream'} - {'old': 'matrix_corporal_docker_image_registry_prefix_upstream_default', 'new': 'matrix_corporal_container_image_registry_prefix_upstream_default'}