Przeglądaj źródła

matrix-cactus-comments-client: 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 dni temu
rodzic
commit
eb98f3e09f
3 zmienionych plików z 10 dodań i 5 usunięć
  1. +0
    -1
      roles/custom/matrix-cactus-comments-client/defaults/main.yml
  2. +2
    -4
      roles/custom/matrix-cactus-comments-client/tasks/install.yml
  3. +8
    -0
      roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-cactus-comments-client/defaults/main.yml Wyświetl plik

@@ -25,7 +25,6 @@ matrix_cactus_comments_client_container_image_registry_prefix: "{{ matrix_cactus
matrix_cactus_comments_client_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_client_container_image_registry_prefix_upstream_default }}" matrix_cactus_comments_client_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_client_container_image_registry_prefix_upstream_default }}"
matrix_cactus_comments_client_container_image_registry_prefix_upstream_default: docker.io/ matrix_cactus_comments_client_container_image_registry_prefix_upstream_default: docker.io/
matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}" matrix_cactus_comments_client_container_image_tag: "{{ 'latest' if matrix_cactus_comments_client_version == 'latest' else (matrix_cactus_comments_client_version + '-alpine') }}"
matrix_cactus_comments_client_container_image_force_pull: "{{ matrix_cactus_comments_client_container_image.endswith(':latest') }}"


matrix_cactus_comments_client_container_network: "" matrix_cactus_comments_client_container_network: ""




+ 2
- 4
roles/custom/matrix-cactus-comments-client/tasks/install.yml Wyświetl plik

@@ -67,11 +67,9 @@
group: "{{ matrix_group_name }}" group: "{{ matrix_group_name }}"


- name: Ensure matrix-cactus-comments-client container image is pulled - name: Ensure matrix-cactus-comments-client container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_cactus_comments_client_container_image }}" name: "{{ matrix_cactus_comments_client_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_cactus_comments_client_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_cactus_comments_client_container_image_force_pull }}"
pull: always
register: matrix_cactus_comments_client_container_image_pull_result register: matrix_cactus_comments_client_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"
delay: "{{ devture_playbook_help_container_retries_delay }}" delay: "{{ devture_playbook_help_container_retries_delay }}"


+ 8
- 0
roles/custom/matrix-cactus-comments-client/tasks/validate_config.yml Wyświetl plik

@@ -13,3 +13,11 @@
- matrix_cactus_comments_client_hostname - matrix_cactus_comments_client_hostname
- matrix_cactus_comments_client_path_prefix - matrix_cactus_comments_client_path_prefix
- matrix_cactus_comments_client_container_network - matrix_cactus_comments_client_container_network

- name: (Deprecation) Catch and report renamed matrix-cactus-comments-client variables
ansible.builtin.fail:
msg: >-
The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
with_items:
- {'old': 'matrix_cactus_comments_client_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

Ładowanie…
Anuluj
Zapisz