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

matrix-media-repo: 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
69e9cfd053
3 измененных файлов: 3 добавлений и 5 удалений
  1. +0
    -1
      roles/custom/matrix-media-repo/defaults/main.yml
  2. +2
    -4
      roles/custom/matrix-media-repo/tasks/setup_install.yml
  3. +1
    -0
      roles/custom/matrix-media-repo/tasks/validate_config.yml

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

@@ -30,7 +30,6 @@ matrix_media_repo_container_image_registry_prefix_upstream: "{{ matrix_media_rep
matrix_media_repo_container_image_registry_prefix_upstream_default: "ghcr.io/" matrix_media_repo_container_image_registry_prefix_upstream_default: "ghcr.io/"
# renovate: datasource=docker depName=ghcr.io/t2bot/matrix-media-repo # renovate: datasource=docker depName=ghcr.io/t2bot/matrix-media-repo
matrix_media_repo_container_image_tag: "v1.3.8" matrix_media_repo_container_image_tag: "v1.3.8"
matrix_media_repo_container_image_force_pull: "{{ matrix_media_repo_container_image.endswith(':latest') }}"


matrix_media_repo_base_path: "{{ matrix_base_data_path }}/{{ matrix_media_repo_identifier }}" matrix_media_repo_base_path: "{{ matrix_base_data_path }}/{{ matrix_media_repo_identifier }}"
matrix_media_repo_config_path: "{{ matrix_media_repo_base_path }}/config" matrix_media_repo_config_path: "{{ matrix_media_repo_base_path }}/config"


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

@@ -47,11 +47,9 @@
register: matrix_media_repo_config_result register: matrix_media_repo_config_result


- name: Ensure media-repo Docker image is pulled - name: Ensure media-repo Docker image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_media_repo_container_image }}" name: "{{ matrix_media_repo_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_media_repo_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_media_repo_container_image_force_pull }}"
pull: always
when: "not matrix_media_repo_container_image_self_build | bool" when: "not matrix_media_repo_container_image_self_build | bool"
register: matrix_media_repo_container_image_pull_result register: matrix_media_repo_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"


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

@@ -39,6 +39,7 @@
- {'old': 'matrix_media_repo_docker_image_registry_prefix_upstream_default', 'new': 'matrix_media_repo_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_media_repo_docker_image_registry_prefix_upstream_default', 'new': 'matrix_media_repo_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_media_repo_docker_image_tag', 'new': 'matrix_media_repo_container_image_tag'} - {'old': 'matrix_media_repo_docker_image_tag', 'new': 'matrix_media_repo_container_image_tag'}
- {'old': 'matrix_media_repo_docker_src_files_path', 'new': 'matrix_media_repo_container_src_files_path'} - {'old': 'matrix_media_repo_docker_src_files_path', 'new': 'matrix_media_repo_container_src_files_path'}
- {'old': 'matrix_media_repo_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}


- name: Fail if required matrix-media-repo settings not defined - name: Fail if required matrix-media-repo settings not defined
ansible.builtin.fail: ansible.builtin.fail:


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