From 7e71d66d86747a1933b43e6a20ce9316ed1597ea Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 4 May 2026 21:59:35 +0300 Subject: [PATCH] matrix-bridge-mx-puppet-groupme: 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-bridge-mx-puppet-groupme/defaults/main.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml index cd78da450..7ddede7a5 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml @@ -29,7 +29,6 @@ matrix_mx_puppet_groupme_container_image: "{{ matrix_mx_puppet_groupme_container matrix_mx_puppet_groupme_container_image_registry_prefix: "{{ 'localhost/' if matrix_mx_puppet_groupme_container_image_self_build else matrix_mx_puppet_groupme_container_image_registry_prefix_upstream }}" matrix_mx_puppet_groupme_container_image_registry_prefix_upstream: "{{ matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default }}" matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default: "registry.gitlab.com/" -matrix_mx_puppet_groupme_container_image_force_pull: "{{ matrix_mx_puppet_groupme_container_image.endswith(':latest') }}" matrix_mx_puppet_groupme_base_path: "{{ matrix_base_data_path }}/mx-puppet-groupme" matrix_mx_puppet_groupme_config_path: "{{ matrix_mx_puppet_groupme_base_path }}/config" diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml index 688ba52e4..44edda784 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml @@ -73,11 +73,9 @@ matrix_mx_puppet_groupme_migration_requires_restart: true - name: Ensure MX Puppet Groupme image is pulled - community.docker.docker_image: + community.docker.docker_image_pull: name: "{{ matrix_mx_puppet_groupme_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_mx_puppet_groupme_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_mx_puppet_groupme_container_image_force_pull }}" + pull: always when: matrix_mx_puppet_groupme_enabled | bool and not matrix_mx_puppet_groupme_container_image_self_build register: matrix_mx_puppet_groupme_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -96,16 +94,14 @@ when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build" - name: Ensure MX Puppet Groupme Docker image is built - community.docker.docker_image: + community.docker.docker_image_build: name: "{{ matrix_mx_puppet_groupme_container_image }}" - source: build - force_source: "{{ matrix_mx_puppet_groupme_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_mx_puppet_groupme_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}" - pull: true + dockerfile: Dockerfile + path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}" + pull: true + rebuild: "{{ 'always' if matrix_mx_puppet_groupme_git_pull_results.changed | bool else 'never' }}" when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build" + register: matrix_mx_puppet_groupme_container_image_build_result - name: Ensure mx-puppet-groupme config.yaml installed ansible.builtin.copy: @@ -148,6 +144,7 @@ or matrix_mx_puppet_groupme_registration_result.changed | default(false) or matrix_mx_puppet_groupme_systemd_service_result.changed | default(false) or matrix_mx_puppet_groupme_container_image_pull_result.changed | default(false) + or matrix_mx_puppet_groupme_container_image_build_result.changed | default(false) }} - name: Ensure matrix-mx-puppet-groupme.service restarted, if necessary diff --git a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml index a710f5581..dd9db865b 100644 --- a/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml +++ b/roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml @@ -18,6 +18,7 @@ - {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream'} - {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_mx_puppet_groupme_docker_src_files_path', 'new': 'matrix_mx_puppet_groupme_container_src_files_path'} + - {'old': 'matrix_mx_puppet_groupme_container_image_force_pull', 'new': ' (the new community.docker.docker_image_pull module handles this natively)'} - name: Fail if required mx-puppet-groupme settings not defined ansible.builtin.fail: