iartamonov/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-05-08 05:10:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Slavi Pantaleev
2026-05-04 22:01:17 +03:00
parent d9bb4cbdc0
commit 0048da1638
3 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-bridge-wechat/defaults/main.yml
-2
View File
@@ -16,7 +16,6 @@ matrix_wechat_container_image: "{{ matrix_wechat_container_image_registry_prefix
matrix_wechat_container_image_registry_prefix: "{{ 'localhost/' if matrix_wechat_container_image_self_build else matrix_wechat_container_image_registry_prefix_upstream }}"
matrix_wechat_container_image_registry_prefix_upstream: "{{ matrix_wechat_container_image_registry_prefix_upstream_default }}"
matrix_wechat_container_image_registry_prefix_upstream_default: "docker.io/"
matrix_wechat_container_image_force_pull: "{{ matrix_wechat_container_image.endswith(':latest') }}"
matrix_wechat_container_image_self_build: false
matrix_wechat_container_image_self_build_repo: "https://github.com/duo/matrix-wechat.git"
@@ -28,7 +27,6 @@ matrix_wechat_agent_container_image: "{{ matrix_wechat_agent_container_image_reg
matrix_wechat_agent_container_image_registry_prefix: "{{ 'localhost/' if matrix_wechat_agent_container_image_self_build else matrix_wechat_agent_container_image_registry_prefix_upstream }}"
matrix_wechat_agent_container_image_registry_prefix_upstream: "{{ matrix_wechat_agent_container_image_registry_prefix_upstream_default }}"
matrix_wechat_agent_container_image_registry_prefix_upstream_default: "docker.io/"
matrix_wechat_agent_container_image_force_pull: "{{ matrix_wechat_agent_container_image.endswith(':latest') }}"
# The agent needs to write to /home/user/.vnc.
# `/home/user` is owned by `user:group` (`1000:1000`), so it needs to run with that user/group.
roles/custom/matrix-bridge-wechat/tasks/install.yml
+18 -24
View File
@@ -21,11 +21,9 @@
when: item.when | bool
- name: Ensure WeChat Bridge image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_wechat_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_wechat_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_wechat_container_image_force_pull }}"
pull: always
when: not matrix_wechat_container_image_self_build
register: matrix_wechat_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -45,22 +43,18 @@
register: matrix_wechat_git_pull_results
- name: Ensure WeChat Bridge container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_wechat_container_image }}"
source: build
force_source: "{{ matrix_wechat_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_wechat_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_wechat_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_wechat_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_wechat_git_pull_results.changed | bool else 'never' }}"
register: matrix_wechat_container_image_build_result
- name: Ensure WeChat Agent image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_wechat_agent_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_wechat_agent_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_wechat_agent_container_image_force_pull }}"
pull: always
when: not matrix_wechat_agent_container_image_self_build
register: matrix_wechat_agent_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -80,15 +74,13 @@
register: matrix_wechat_agent_git_pull_results
- name: Ensure WeChat Agent container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_wechat_agent_container_image }}"
source: build
force_source: "{{ matrix_wechat_agent_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_wechat_agent_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_wechat_agent_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_wechat_agent_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_wechat_agent_git_pull_results.changed | bool else 'never' }}"
register: matrix_wechat_agent_container_image_build_result
- name: Ensure WeChat configuration installed
ansible.builtin.copy:
@@ -149,4 +141,6 @@
or matrix_wechat_agent_systemd_service_result.changed | default(false)
or matrix_wechat_container_image_pull_result.changed | default(false)
or matrix_wechat_agent_container_image_pull_result.changed | default(false)
or matrix_wechat_container_image_build_result.changed | default(false)
or matrix_wechat_agent_container_image_build_result.changed | default(false)
}}
roles/custom/matrix-bridge-wechat/tasks/validate_config.yml
+2
View File
@@ -30,3 +30,5 @@
with_items:
- {'old': 'matrix_wechat_container_image_name_prefix', 'new': 'matrix_wechat_container_image_registry_prefix'}
- {'old': 'matrix_wechat_agent_container_image_name_prefix', 'new': 'matrix_wechat_agent_container_image_registry_prefix'}
- {'old': 'matrix_wechat_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- {'old': 'matrix_wechat_agent_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}