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

matrix-bridge-mautrix-meta-messenger: 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 21:51:44 +03:00
parent 6bc4c22a02
commit 9251e31b6c
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml
-1
View File
@@ -36,7 +36,6 @@ matrix_mautrix_meta_messenger_container_image_registry_prefix_upstream: "{{ matr
matrix_mautrix_meta_messenger_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
# Prebuilt container images for specific commit hashes are tagged with an architecture suffix (e.g. `HASH-amd64`).
matrix_mautrix_meta_messenger_container_image_tag: "{{ matrix_mautrix_meta_messenger_version }}{{ ('-' ~ matrix_architecture) if (matrix_mautrix_meta_messenger_version | length == 40) else '' }}"
matrix_mautrix_meta_messenger_container_image_force_pull: "{{ matrix_mautrix_meta_messenger_container_image.endswith(':latest') }}"
matrix_mautrix_meta_messenger_container_network: ""
roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml
+9 -12
View File
@@ -33,11 +33,9 @@
matrix_mautrix_meta_messenger_migration_requires_restart: true
- name: Ensure mautrix-meta-messenger container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_mautrix_meta_messenger_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_mautrix_meta_messenger_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_mautrix_meta_messenger_container_image_force_pull }}"
pull: always
when: not matrix_mautrix_meta_messenger_container_image_self_build
register: matrix_mautrix_meta_messenger_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -71,15 +69,13 @@
register: matrix_mautrix_meta_messenger_git_pull_results
- name: Ensure mautrix-meta-messenger container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_mautrix_meta_messenger_container_image }}"
source: build
force_source: "{{ matrix_mautrix_meta_messenger_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_mautrix_meta_messenger_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_mautrix_meta_messenger_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_mautrix_meta_messenger_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_mautrix_meta_messenger_git_pull_results.changed | bool else 'never' }}"
register: matrix_mautrix_meta_messenger_container_image_build_result
- name: Ensure mautrix-meta-messenger config.yaml installed
ansible.builtin.copy:
@@ -134,6 +130,7 @@
or matrix_mautrix_meta_messenger_support_files_result.changed | default(false)
or matrix_mautrix_meta_messenger_systemd_service_result.changed | default(false)
or matrix_mautrix_meta_messenger_container_image_pull_result.changed | default(false)
or matrix_mautrix_meta_messenger_container_image_build_result.changed | default(false)
}}
- name: Ensure mautrix-meta-messenger.service restarted, if necessary
roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/validate_config.yml
+1
View File
@@ -31,3 +31,4 @@
- {'old': 'matrix_mautrix_meta_messenger_bridge_login_shared_secret_map_custom', 'new': '<superseded by matrix_mautrix_meta_messenger_double_puppet_secrets_custom>'}
- {'old': 'matrix_mautrix_meta_messenger_bridge_management_room_text_welcome', 'new': '<removed>'}
- {'old': 'matrix_mautrix_meta_messenger_container_image_name_prefix', 'new': 'matrix_mautrix_meta_messenger_container_image_registry_prefix'}
- {'old': 'matrix_mautrix_meta_messenger_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}