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

Fix docker image build results not affecting conditional restart for ldap-registration-proxy and matrixto

These roles had conditional restart logic (restart_necessary set_fact) but
the docker_image build task result was not registered or included in the
condition, so a changed image build would not trigger a service restart.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
pull/5063/head
Slavi Pantaleev 1 день назад
Родитель
Сommit
b092e126a9
2 измененных файлов: 4 добавлений и 0 удалений
  1. +2
    -0
      roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml
  2. +2
    -0
      roles/custom/matrix-matrixto/tasks/install.yml

+ 2
- 0
roles/custom/matrix-ldap-registration-proxy/tasks/setup_install.yml Просмотреть файл

@@ -40,6 +40,7 @@
path: "{{ matrix_ldap_registration_proxy_container_src_files_path }}" path: "{{ matrix_ldap_registration_proxy_container_src_files_path }}"
pull: true pull: true
when: true when: true
register: matrix_ldap_registration_proxy_container_image_build_result


- name: Ensure matrix_ldap_registration_proxy config installed - name: Ensure matrix_ldap_registration_proxy config installed
ansible.builtin.template: ansible.builtin.template:
@@ -82,4 +83,5 @@
matrix_ldap_registration_proxy_config_result.changed | default(false) matrix_ldap_registration_proxy_config_result.changed | default(false)
or matrix_ldap_registration_proxy_support_files_result.changed | default(false) or matrix_ldap_registration_proxy_support_files_result.changed | default(false)
or matrix_ldap_registration_proxy_systemd_service_result.changed | default(false) or matrix_ldap_registration_proxy_systemd_service_result.changed | default(false)
or matrix_ldap_registration_proxy_container_image_build_result.changed | default(false)
}} }}

+ 2
- 0
roles/custom/matrix-matrixto/tasks/install.yml Просмотреть файл

@@ -45,6 +45,7 @@
path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}" path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}"
pull: true pull: true
args: args:
register: matrix_matrixto_container_image_build_result


- name: Ensure Matrix.to container network is created via community.docker.docker_network - name: Ensure Matrix.to container network is created via community.docker.docker_network
when: devture_systemd_docker_base_container_network_creation_method == 'ansible-module' when: devture_systemd_docker_base_container_network_creation_method == 'ansible-module'
@@ -79,4 +80,5 @@
{{ {{
matrix_matrixto_support_files_result.changed | default(false) matrix_matrixto_support_files_result.changed | default(false)
or matrix_matrixto_systemd_service_result.changed | default(false) or matrix_matrixto_systemd_service_result.changed | default(false)
or matrix_matrixto_container_image_build_result.changed | default(false)
}} }}

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