Procházet zdrojové kódy

matrix-bridge-hookshot: switch to modern community.docker docker_image modules

Replaces `community.docker.docker_image` with the modern
`docker_image_pull` and `docker_image_build` split modules. 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`). Also registers
`_container_image_build_result` so that a self-build rebuild correctly
triggers a service restart.

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/5192/head
Slavi Pantaleev před 2 dny
rodič
revize
509222719b
3 změnil soubory, kde provedl 10 přidání a 13 odebrání
  1. +0
    -1
      roles/custom/matrix-bridge-hookshot/defaults/main.yml
  2. +9
    -12
      roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml
  3. +1
    -0
      roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-bridge-hookshot/defaults/main.yml Zobrazit soubor

@@ -35,7 +35,6 @@ matrix_hookshot_container_image: "{{ matrix_hookshot_container_image_registry_pr
matrix_hookshot_container_image_registry_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_hookshot_container_image_registry_prefix_upstream }}" matrix_hookshot_container_image_registry_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_hookshot_container_image_registry_prefix_upstream }}"
matrix_hookshot_container_image_registry_prefix_upstream: "{{ matrix_hookshot_container_image_registry_prefix_upstream_default }}" matrix_hookshot_container_image_registry_prefix_upstream: "{{ matrix_hookshot_container_image_registry_prefix_upstream_default }}"
matrix_hookshot_container_image_registry_prefix_upstream_default: "ghcr.io/" matrix_hookshot_container_image_registry_prefix_upstream_default: "ghcr.io/"
matrix_hookshot_container_image_force_pull: "{{ matrix_hookshot_container_image.endswith(':latest') }}"


matrix_hookshot_base_path: "{{ matrix_base_data_path }}/hookshot" matrix_hookshot_base_path: "{{ matrix_base_data_path }}/hookshot"




+ 9
- 12
roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml Zobrazit soubor

@@ -29,11 +29,9 @@
when: item.when | bool when: item.when | bool


- name: Ensure hookshot image is pulled - name: Ensure hookshot image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_hookshot_container_image }}" name: "{{ matrix_hookshot_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_hookshot_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_hookshot_container_image_force_pull }}"
pull: always
when: not matrix_hookshot_container_image_self_build when: not matrix_hookshot_container_image_self_build
register: matrix_hookshot_container_image_pull_result register: matrix_hookshot_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -52,16 +50,14 @@
when: "matrix_hookshot_container_image_self_build | bool" when: "matrix_hookshot_container_image_self_build | bool"


- name: Ensure hookshot Docker image is built - name: Ensure hookshot Docker image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_hookshot_container_image }}" name: "{{ matrix_hookshot_container_image }}"
source: build
force_source: "{{ matrix_hookshot_git_pull_results.changed 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_hookshot_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_hookshot_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_hookshot_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_hookshot_git_pull_results.changed | bool else 'never' }}"
when: "matrix_hookshot_container_image_self_build | bool" when: "matrix_hookshot_container_image_self_build | bool"
register: matrix_hookshot_container_image_build_result


- name: Check if hookshot passkey exists - name: Check if hookshot passkey exists
ansible.builtin.stat: ansible.builtin.stat:
@@ -172,4 +168,5 @@
or matrix_hookshot_support_files_result.changed | default(false) or matrix_hookshot_support_files_result.changed | default(false)
or matrix_hookshot_systemd_service_result.changed | default(false) or matrix_hookshot_systemd_service_result.changed | default(false)
or matrix_hookshot_container_image_pull_result.changed | default(false) or matrix_hookshot_container_image_pull_result.changed | default(false)
or matrix_hookshot_container_image_build_result.changed | default(false)
}} }}

+ 1
- 0
roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml Zobrazit soubor

@@ -52,6 +52,7 @@
- {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream'} - {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream'}
- {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream_default', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream_default', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_hookshot_docker_src_files_path', 'new': 'matrix_hookshot_container_src_files_path'} - {'old': 'matrix_hookshot_docker_src_files_path', 'new': 'matrix_hookshot_container_src_files_path'}
- {'old': 'matrix_hookshot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}


- name: Fail if required Hookshot settings not defined - name: Fail if required Hookshot settings not defined
ansible.builtin.fail: ansible.builtin.fail:


Načítá se…
Zrušit
Uložit