cqrenet/matrix-docker-ansible-deploy
3
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-05-10 17:24:36 +00:00
Code Issues Wiki Activity

matrix-synapse-auto-compressor: 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:23:30 +03:00
parent 867969a823
commit d943939f28
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/custom/matrix-synapse-auto-compressor/defaults/main.yml
View File

@@ -33,7 +33,6 @@ matrix_synapse_auto_compressor_container_image: "{{ matrix_synapse_auto_compress
matrix_synapse_auto_compressor_container_image_registry_prefix: "{{ 'localhost/' if matrix_synapse_auto_compressor_container_image_self_build else matrix_synapse_auto_compressor_container_image_registry_prefix_upstream }}" matrix_synapse_auto_compressor_container_image_registry_prefix: "{{ 'localhost/' if matrix_synapse_auto_compressor_container_image_self_build else matrix_synapse_auto_compressor_container_image_registry_prefix_upstream }}"
matrix_synapse_auto_compressor_container_image_registry_prefix_upstream: "{{ matrix_synapse_auto_compressor_container_image_registry_prefix_upstream_default }}" matrix_synapse_auto_compressor_container_image_registry_prefix_upstream: "{{ matrix_synapse_auto_compressor_container_image_registry_prefix_upstream_default }}"
matrix_synapse_auto_compressor_container_image_registry_prefix_upstream_default: "registry.gitlab.com/" matrix_synapse_auto_compressor_container_image_registry_prefix_upstream_default: "registry.gitlab.com/"
matrix_synapse_auto_compressor_container_image_force_pull: "{{ matrix_synapse_auto_compressor_container_image.endswith(':latest') }}"
# The base container network. It will be auto-created by this role if it doesn't exist already. # The base container network. It will be auto-created by this role if it doesn't exist already.
matrix_synapse_auto_compressor_container_network: matrix-synapse-auto-compressor matrix_synapse_auto_compressor_container_network: matrix-synapse-auto-compressor

6
roles/custom/matrix-synapse-auto-compressor/tasks/install.yml
View File

@@ -39,11 +39,9 @@
register: matrix_synapse_auto_compressor_config_script_result register: matrix_synapse_auto_compressor_config_script_result
- name: Ensure synapse-auto-compressor image is pulled - name: Ensure synapse-auto-compressor image is pulled
community.docker.docker_image: community.docker.docker_image_pull:
name: "{{ matrix_synapse_auto_compressor_container_image }}" name: "{{ matrix_synapse_auto_compressor_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" pull: always
force_source: "{{ matrix_synapse_auto_compressor_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_auto_compressor_container_image_force_pull }}"
when: "not matrix_synapse_auto_compressor_container_image_self_build | bool" when: "not matrix_synapse_auto_compressor_container_image_self_build | bool"
register: matrix_synapse_auto_compressor_container_image_pull_result register: matrix_synapse_auto_compressor_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"

2
roles/custom/matrix-synapse-auto-compressor/tasks/validate_config.yml
View File

@@ -15,6 +15,8 @@
"new": "matrix_synapse_auto_compressor_schedule" "new": "matrix_synapse_auto_compressor_schedule"
- "old": "matrix_synapse_auto_compressor_container_image_name_prefix" - "old": "matrix_synapse_auto_compressor_container_image_name_prefix"
"new": "matrix_synapse_auto_compressor_container_image_registry_prefix" "new": "matrix_synapse_auto_compressor_container_image_registry_prefix"
- "old": "matrix_synapse_auto_compressor_container_image_force_pull"
"new": "<removed> (the new community.docker.docker_image_pull module handles this natively)"
- name: Fail if required matrix-synapse-auto-compressor settings not defined - name: Fail if required matrix-synapse-auto-compressor settings not defined
ansible.builtin.fail: ansible.builtin.fail: