Просмотр исходного кода

matrix-sygnal: switch to modern community.docker docker_image modules

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
Slavi Pantaleev 2 дней назад
Родитель
Сommit
d3b940f706
3 измененных файлов: 3 добавлений и 5 удалений
  1. +0
    -1
      roles/custom/matrix-sygnal/defaults/main.yml
  2. +2
    -4
      roles/custom/matrix-sygnal/tasks/install.yml
  3. +1
    -0
      roles/custom/matrix-sygnal/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-sygnal/defaults/main.yml Просмотреть файл

@@ -39,7 +39,6 @@ matrix_sygnal_container_image_tag: "{{ matrix_sygnal_version }}"
matrix_sygnal_container_image_registry_prefix: "{{ matrix_sygnal_container_image_registry_prefix_upstream }}"
matrix_sygnal_container_image_registry_prefix_upstream: "{{ matrix_sygnal_container_image_registry_prefix_upstream_default }}"
matrix_sygnal_container_image_registry_prefix_upstream_default: "docker.io/"
matrix_sygnal_container_image_force_pull: "{{ matrix_sygnal_container_image.endswith(':latest') }}"

# The base container network. It will be auto-created by this role if it doesn't exist already.
matrix_sygnal_container_network: "{{ matrix_sygnal_identifier }}"


+ 2
- 4
roles/custom/matrix-sygnal/tasks/install.yml Просмотреть файл

@@ -40,11 +40,9 @@
register: matrix_sygnal_support_files_result

- name: Ensure Sygnal image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_sygnal_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_sygnal_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_sygnal_container_image_force_pull }}"
pull: always
register: matrix_sygnal_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}"


+ 1
- 0
roles/custom/matrix-sygnal/tasks/validate_config.yml Просмотреть файл

@@ -18,6 +18,7 @@
- {'old': 'matrix_sygnal_docker_image_registry_prefix_upstream', 'new': 'matrix_sygnal_container_image_registry_prefix_upstream'}
- {'old': 'matrix_sygnal_docker_image_registry_prefix_upstream_default', 'new': 'matrix_sygnal_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_sygnal_docker_image_tag', 'new': 'matrix_sygnal_container_image_tag'}
- {'old': 'matrix_sygnal_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}


- name: Fail if required Sygnal settings not defined


Загрузка…
Отмена
Сохранить