From b91ce393e65dc2f4a125d8aeca5df74b8dda4dda Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 4 May 2026 22:25:11 +0300 Subject: [PATCH] matrix-user-verification-service: 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) --- .../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-user-verification-service/defaults/main.yml b/roles/custom/matrix-user-verification-service/defaults/main.yml index bff5c1ca3..ba606c2c3 100644 --- a/roles/custom/matrix-user-verification-service/defaults/main.yml +++ b/roles/custom/matrix-user-verification-service/defaults/main.yml @@ -34,7 +34,6 @@ matrix_user_verification_service_container_image: "{{ matrix_user_verification_s matrix_user_verification_service_container_image_registry_prefix: "{{ 'localhost/' if matrix_user_verification_service_container_image_self_build else matrix_user_verification_service_container_image_registry_prefix_upstream }}" matrix_user_verification_service_container_image_registry_prefix_upstream: "{{ matrix_user_verification_service_container_image_registry_prefix_upstream_default }}" matrix_user_verification_service_container_image_registry_prefix_upstream_default: "docker.io/" -matrix_user_verification_service_container_image_force_pull: "{{ matrix_user_verification_service_container_image.endswith(':latest') }}" # The base container network. It will be auto-created by this role if it doesn't exist already. matrix_user_verification_service_container_network: "" diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml index d0d2dd656..6d6646579 100644 --- a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml +++ b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml @@ -19,11 +19,9 @@ when: item.when | bool - name: Ensure Matrix User Verification Service image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_user_verification_service_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_user_verification_service_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_user_verification_service_container_image_force_pull }}" + pull: always register: matrix_user_verification_service_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" @@ -42,16 +40,14 @@ when: "matrix_user_verification_service_container_image_self_build | bool" - name: Ensure Matrix User Verification Service image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_user_verification_service_container_image }}" - source: build - force_source: "{{ matrix_user_verification_service_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_user_verification_service_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_user_verification_service_container_src_files_path }}" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_user_verification_service_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_user_verification_service_git_pull_results.changed | bool else 'never' }}" when: "matrix_user_verification_service_container_image_self_build | bool" + register: matrix_user_verification_service_container_image_build_result - name: Ensure Matrix User Verification Service env file installed ansible.builtin.template: @@ -83,4 +79,5 @@ matrix_user_verification_service_config_result.changed | default(false) or matrix_user_verification_service_systemd_service_result.changed | default(false) or matrix_user_verification_service_container_image_pull_result.changed | default(false) + or matrix_user_verification_service_container_image_build_result.changed | default(false) }} diff --git a/roles/custom/matrix-user-verification-service/tasks/validate_config.yml b/roles/custom/matrix-user-verification-service/tasks/validate_config.yml index 6d7d9f04d..d39fa6b35 100644 --- a/roles/custom/matrix-user-verification-service/tasks/validate_config.yml +++ b/roles/custom/matrix-user-verification-service/tasks/validate_config.yml @@ -19,6 +19,7 @@ - {'old': 'matrix_user_verification_service_docker_image_registry_prefix_upstream', 'new': 'matrix_user_verification_service_container_image_registry_prefix_upstream'} - {'old': 'matrix_user_verification_service_docker_image_registry_prefix_upstream_default', 'new': 'matrix_user_verification_service_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_user_verification_service_docker_src_files_path', 'new': 'matrix_user_verification_service_container_src_files_path'} + - {'old': 'matrix_user_verification_service_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Verify homeserver_url is not empty ansible.builtin.assert: