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>pull/4219/merge
| @@ -17,7 +17,6 @@ matrix_mautrix_wsproxy_container_image: "{{ matrix_mautrix_wsproxy_container_ima | |||||
| matrix_mautrix_wsproxy_container_image_registry_prefix: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream }}" | matrix_mautrix_wsproxy_container_image_registry_prefix: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream }}" | ||||
| matrix_mautrix_wsproxy_container_image_registry_prefix_upstream: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default }}" | matrix_mautrix_wsproxy_container_image_registry_prefix_upstream: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default }}" | ||||
| matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default: "dock.mau.dev/" | matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default: "dock.mau.dev/" | ||||
| matrix_mautrix_wsproxy_container_image_force_pull: "{{ matrix_mautrix_wsproxy_container_image.endswith(':latest') }}" | |||||
| matrix_mautrix_wsproxy_base_path: "{{ matrix_base_data_path }}/wsproxy" | matrix_mautrix_wsproxy_base_path: "{{ matrix_base_data_path }}/wsproxy" | ||||
| matrix_mautrix_wsproxy_config_path: "{{ matrix_mautrix_wsproxy_base_path }}/config" | matrix_mautrix_wsproxy_config_path: "{{ matrix_mautrix_wsproxy_base_path }}/config" | ||||
| @@ -148,7 +147,6 @@ matrix_mautrix_imessage_registration: "{{ matrix_mautrix_imessage_registration_y | |||||
| matrix_mautrix_wsproxy_syncproxy_version: latest | matrix_mautrix_wsproxy_syncproxy_version: latest | ||||
| # See: https://mau.dev/mautrix/wsproxy/container_registry | # See: https://mau.dev/mautrix/wsproxy/container_registry | ||||
| matrix_mautrix_wsproxy_syncproxy_container_image: "dock.mau.dev/mautrix/syncproxy:{{ matrix_mautrix_wsproxy_syncproxy_version }}" | matrix_mautrix_wsproxy_syncproxy_container_image: "dock.mau.dev/mautrix/syncproxy:{{ matrix_mautrix_wsproxy_syncproxy_version }}" | ||||
| matrix_mautrix_wsproxy_syncproxy_container_image_force_pull: "{{ matrix_mautrix_wsproxy_syncproxy_container_image.endswith(':latest') }}" | |||||
| matrix_mautrix_wsproxy_syncproxy_container_extra_arguments: [] | matrix_mautrix_wsproxy_syncproxy_container_extra_arguments: [] | ||||
| matrix_mautrix_wsproxy_syncproxy_systemd_required_services_list: |- | matrix_mautrix_wsproxy_syncproxy_systemd_required_services_list: |- | ||||
| @@ -46,20 +46,22 @@ | |||||
| register: matrix_mautrix_wsproxy_support_files_result | register: matrix_mautrix_wsproxy_support_files_result | ||||
| - name: Ensure Mautrix wsproxy image is pulled | - name: Ensure Mautrix wsproxy image is pulled | ||||
| community.docker.docker_image: | |||||
| community.docker.docker_image_pull: | |||||
| name: "{{ matrix_mautrix_wsproxy_container_image }}" | name: "{{ matrix_mautrix_wsproxy_container_image }}" | ||||
| source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" | |||||
| force_source: "{{ matrix_mautrix_wsproxy_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_mautrix_wsproxy_container_image_force_pull }}" | |||||
| pull: always | |||||
| register: matrix_mautrix_wsproxy_container_image_pull_result | register: matrix_mautrix_wsproxy_container_image_pull_result | ||||
| retries: "{{ devture_playbook_help_container_retries_count }}" | |||||
| delay: "{{ devture_playbook_help_container_retries_delay }}" | |||||
| until: matrix_mautrix_wsproxy_container_image_pull_result is not failed | |||||
| - name: Ensure Mautrix syncproxy image is pulled | - name: Ensure Mautrix syncproxy image is pulled | ||||
| community.docker.docker_image: | |||||
| community.docker.docker_image_pull: | |||||
| name: "{{ matrix_mautrix_wsproxy_syncproxy_container_image }}" | name: "{{ matrix_mautrix_wsproxy_syncproxy_container_image }}" | ||||
| source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" | |||||
| force_source: "{{ matrix_mautrix_wsproxy_syncproxy_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_mautrix_wsproxy_syncproxy_container_image_force_pull }}" | |||||
| pull: always | |||||
| register: matrix_mautrix_wsproxy_syncproxy_container_image_pull_result | register: matrix_mautrix_wsproxy_syncproxy_container_image_pull_result | ||||
| retries: "{{ devture_playbook_help_container_retries_count }}" | |||||
| delay: "{{ devture_playbook_help_container_retries_delay }}" | |||||
| until: matrix_mautrix_wsproxy_syncproxy_container_image_pull_result is not failed | |||||
| - name: Ensure Mautrix wsproxy paths exists | - name: Ensure Mautrix wsproxy paths exists | ||||
| ansible.builtin.file: | ansible.builtin.file: | ||||
| @@ -19,6 +19,8 @@ | |||||
| - {'old': 'matrix_mautrix_wsproxy_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default'} | - {'old': 'matrix_mautrix_wsproxy_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default'} | ||||
| - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image'} | - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image'} | ||||
| - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image_force_pull', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image_force_pull'} | - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image_force_pull', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image_force_pull'} | ||||
| - {'old': 'matrix_mautrix_wsproxy_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'} | |||||
| - {'old': 'matrix_mautrix_wsproxy_syncproxy_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'} | |||||
| - name: Fail if required settings not defined | - name: Fail if required settings not defined | ||||