Sfoglia il codice sorgente

matrix-livekit-jwt-service: 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/4219/merge
Slavi Pantaleev 2 giorni fa
parent
commit
3976c3e317
3 ha cambiato i file con 10 aggiunte e 13 eliminazioni
  1. +0
    -1
      roles/custom/matrix-livekit-jwt-service/defaults/main.yml
  2. +9
    -12
      roles/custom/matrix-livekit-jwt-service/tasks/install.yml
  3. +1
    -0
      roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-livekit-jwt-service/defaults/main.yml Vedi File

@@ -37,7 +37,6 @@ matrix_livekit_jwt_service_container_image_registry_prefix: "{{ 'localhost/' if
matrix_livekit_jwt_service_container_image_registry_prefix_upstream: "{{ matrix_livekit_jwt_service_container_image_registry_prefix_upstream_default }}" matrix_livekit_jwt_service_container_image_registry_prefix_upstream: "{{ matrix_livekit_jwt_service_container_image_registry_prefix_upstream_default }}"
matrix_livekit_jwt_service_container_image_registry_prefix_upstream_default: ghcr.io/ matrix_livekit_jwt_service_container_image_registry_prefix_upstream_default: ghcr.io/
matrix_livekit_jwt_service_container_image_tag: "{{ matrix_livekit_jwt_service_version }}" matrix_livekit_jwt_service_container_image_tag: "{{ matrix_livekit_jwt_service_version }}"
matrix_livekit_jwt_service_container_image_force_pull: "{{ matrix_livekit_jwt_service_container_image.endswith(':latest') }}"


matrix_livekit_jwt_service_container_labels_traefik_enabled: true matrix_livekit_jwt_service_container_labels_traefik_enabled: true
matrix_livekit_jwt_service_container_labels_traefik_docker_network: "{{ matrix_livekit_jwt_service_container_network }}" matrix_livekit_jwt_service_container_labels_traefik_docker_network: "{{ matrix_livekit_jwt_service_container_network }}"


+ 9
- 12
roles/custom/matrix-livekit-jwt-service/tasks/install.yml Vedi File

@@ -29,11 +29,9 @@
register: matrix_livekit_jwt_service_support_files_result register: matrix_livekit_jwt_service_support_files_result


- name: Ensure LiveKit JWT Service container image is pulled - name: Ensure LiveKit JWT Service container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_livekit_jwt_service_container_image }}" name: "{{ matrix_livekit_jwt_service_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_livekit_jwt_service_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_livekit_jwt_service_container_image_force_pull }}"
pull: always
when: "not matrix_livekit_jwt_service_container_image_self_build | bool" when: "not matrix_livekit_jwt_service_container_image_self_build | bool"
register: matrix_livekit_jwt_service_container_image_pull_result register: matrix_livekit_jwt_service_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -53,15 +51,13 @@
register: matrix_livekit_jwt_service_git_pull_results register: matrix_livekit_jwt_service_git_pull_results


- name: Ensure LiveKit JWT Service container image is built - name: Ensure LiveKit JWT Service container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_livekit_jwt_service_container_image }}" name: "{{ matrix_livekit_jwt_service_container_image }}"
source: build
force_source: "{{ matrix_livekit_jwt_service_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_livekit_jwt_service_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_livekit_jwt_service_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_livekit_jwt_service_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_livekit_jwt_service_git_pull_results.changed | bool else 'never' }}"
register: matrix_livekit_jwt_service_container_image_build_result


- name: Ensure LiveKit JWT Service container network is created - name: Ensure LiveKit JWT Service container network is created
community.general.docker_network: community.general.docker_network:
@@ -84,4 +80,5 @@
matrix_livekit_jwt_service_support_files_result.changed | default(false) matrix_livekit_jwt_service_support_files_result.changed | default(false)
or matrix_livekit_jwt_service_systemd_service_result.changed | default(false) or matrix_livekit_jwt_service_systemd_service_result.changed | default(false)
or matrix_livekit_jwt_service_container_image_pull_result.changed | default(false) or matrix_livekit_jwt_service_container_image_pull_result.changed | default(false)
or matrix_livekit_jwt_service_container_image_build_result.changed | default(false)
}} }}

+ 1
- 0
roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml Vedi File

@@ -14,6 +14,7 @@
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0" when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
with_items: with_items:
- {'old': 'matrix_livekit_jwt_service_environment_variable_livekit_jwt_port', 'new': 'matrix_livekit_jwt_service_container_port'} - {'old': 'matrix_livekit_jwt_service_environment_variable_livekit_jwt_port', 'new': 'matrix_livekit_jwt_service_container_port'}
- {'old': 'matrix_livekit_jwt_service_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}


- name: Fail if required LiveKit JWT Service settings are not defined - name: Fail if required LiveKit JWT Service settings are not defined
ansible.builtin.fail: ansible.builtin.fail:


Caricamento…
Annulla
Salva