iartamonov/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-05-08 13:20:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

matrix-synapse-usage-exporter: switch to modern community.docker docker_image modules

Browse Source 
Replaces `community.docker.docker_image` with the modern
`docker_image_pull` module. 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`).

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/5191.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
2026-05-04 21:18:13 +03:00
parent d3b940f706
commit 8ac2ea6cb0
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-synapse-usage-exporter/defaults/main.yml
-1
View File
@@ -32,7 +32,6 @@ matrix_synapse_usage_exporter_container_image_registry_prefix: "{{ 'localhost/'
matrix_synapse_usage_exporter_container_image_registry_prefix_upstream: "{{ matrix_synapse_usage_exporter_container_image_registry_prefix_upstream_default }}"
matrix_synapse_usage_exporter_container_image_registry_prefix_upstream_default: "docker.io/"
matrix_synapse_usage_exporter_container_image_tag: "{{ 'main' if matrix_synapse_usage_exporter_container_image_self_build else 'latest' }}"
matrix_synapse_usage_exporter_container_image_force_pull: "{{ matrix_synapse_usage_exporter_container_image.endswith(':latest') }}"
matrix_synapse_usage_exporter_base_path: "{{ matrix_base_data_path }}/{{ matrix_synapse_usage_exporter_identifier }}"
matrix_synapse_usage_exporter_docker_src_files_path: "{{ matrix_synapse_usage_exporter_base_path }}/docker-src"
roles/custom/matrix-synapse-usage-exporter/tasks/setup_install.yml
+2 -4
View File
@@ -32,11 +32,9 @@
register: matrix_synapse_usage_exporter_support_files_result
- name: Ensure synapse-usage-exporter Docker image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_synapse_usage_exporter_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_synapse_usage_exporter_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_synapse_usage_exporter_container_image_force_pull }}"
pull: always
when: "not matrix_synapse_usage_exporter_container_image_self_build | bool"
register: matrix_synapse_usage_exporter_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
roles/custom/matrix-synapse-usage-exporter/tasks/validate_config.yml
+1
View File
@@ -13,3 +13,4 @@
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
with_items:
- {'old': 'matrix_synapse_usage_exporter_docker_image_name_prefix', 'new': 'matrix_synapse_usage_exporter_container_image_registry_prefix'}
- {'old': 'matrix_synapse_usage_exporter_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}