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

matrix-bridge-appservice-irc: 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 дней назад
Родитель
Сommit
eddebb3e12
3 измененных файлов: 10 добавлений и 13 удалений
  1. +0
    -1
      roles/custom/matrix-bridge-appservice-irc/defaults/main.yml
  2. +9
    -12
      roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml
  3. +1
    -0
      roles/custom/matrix-bridge-appservice-irc/tasks/validate_config.yml

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

@@ -39,7 +39,6 @@ matrix_appservice_irc_container_image_registry_prefix: "{{ 'localhost/' if matri
matrix_appservice_irc_container_image_registry_prefix_upstream: "{{ matrix_appservice_irc_container_image_registry_prefix_upstream_default }}"
matrix_appservice_irc_container_image_registry_prefix_upstream_default: docker.io/
matrix_appservice_irc_container_image_tag: "{{ 'latest' if matrix_appservice_irc_version == 'latest' else ('release-' + matrix_appservice_irc_version) }}"
matrix_appservice_irc_container_image_force_pull: "{{ matrix_appservice_irc_container_image.endswith(':latest') }}"

matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"
matrix_appservice_irc_config_path: "{{ matrix_appservice_irc_base_path }}/config"


+ 9
- 12
roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml Просмотреть файл

@@ -80,11 +80,9 @@
matrix_appservice_irc_migration_requires_restart: true

- name: Ensure Appservice IRC image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_appservice_irc_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_appservice_irc_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_appservice_irc_container_image_force_pull }}"
pull: always
when: "matrix_appservice_irc_enabled | bool and not matrix_appservice_irc_container_image_self_build | bool"
register: matrix_appservice_irc_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -103,16 +101,14 @@
when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool"

- name: Ensure matrix-appservice-irc Docker image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_appservice_irc_container_image }}"
source: build
force_source: "{{ matrix_appservice_irc_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_appservice_irc_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_appservice_irc_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_appservice_irc_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_appservice_irc_git_pull_results.changed | bool else 'never' }}"
when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool and matrix_appservice_irc_git_pull_results.changed"
register: matrix_appservice_irc_container_image_build_result

- name: Ensure Matrix Appservice IRC config installed
ansible.builtin.copy:
@@ -272,6 +268,7 @@
or matrix_appservice_irc_registration_result.changed | default(false)
or matrix_appservice_irc_systemd_service_result.changed | default(false)
or matrix_appservice_irc_container_image_pull_result.changed | default(false)
or matrix_appservice_irc_container_image_build_result.changed | default(false)
}}

- name: Ensure matrix-appservice-irc.service restarted, if necessary


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

@@ -26,6 +26,7 @@
- {'old': 'matrix_appservice_irc_docker_repo', 'new': 'matrix_appservice_irc_container_repo'}
- {'old': 'matrix_appservice_irc_docker_repo_version', 'new': 'matrix_appservice_irc_container_repo_version'}
- {'old': 'matrix_appservice_irc_docker_src_files_path', 'new': 'matrix_appservice_irc_container_src_files_path'}
- {'old': 'matrix_appservice_irc_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

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


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