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-conduit: 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 22:06:15 +03:00
parent eb98f3e09f
commit 1ce8ab804f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-conduit/defaults/main.yml
-1
View File
@@ -20,7 +20,6 @@ matrix_conduit_container_image_registry_prefix_upstream: "{{ matrix_conduit_cont
matrix_conduit_container_image_registry_prefix_upstream_default: docker.io/
# renovate: datasource=docker depName=matrixconduit/matrix-conduit
matrix_conduit_container_image_tag: "v0.10.12"
matrix_conduit_container_image_force_pull: "{{ matrix_conduit_container_image.endswith(':latest') }}"
matrix_conduit_base_path: "{{ matrix_base_data_path }}/conduit"
matrix_conduit_config_path: "{{ matrix_conduit_base_path }}/config"
roles/custom/matrix-conduit/tasks/setup_install.yml
+2 -4
View File
@@ -52,11 +52,9 @@
driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
- name: Ensure Conduit container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_conduit_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_conduit_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_conduit_container_image_force_pull }}"
pull: always
register: matrix_conduit_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}"
roles/custom/matrix-conduit/tasks/validate_config.yml
+1
View File
@@ -17,6 +17,7 @@
- {'old': 'matrix_conduit_docker_image_registry_prefix_upstream', 'new': 'matrix_conduit_container_image_registry_prefix_upstream'}
- {'old': 'matrix_conduit_docker_image_registry_prefix_upstream_default', 'new': 'matrix_conduit_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_conduit_docker_image_tag', 'new': 'matrix_conduit_container_image_tag'}
- {'old': 'matrix_conduit_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- name: Fail if required Conduit settings not defined
ansible.builtin.fail: