cqrenet/matrix-docker-ansible-deploy
4
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-05-20 12:58:02 +00:00
Code Issues Wiki Activity

matrix-bot-baibot: 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:40:37 +03:00
parent 5b041201a4
commit c82415cd7b
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
roles/custom/matrix-bot-baibot/defaults/main.yml
View File

@@ -22,7 +22,6 @@ matrix_bot_baibot_container_image: "{{ matrix_bot_baibot_container_image_registr
matrix_bot_baibot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_baibot_container_image_self_build else matrix_bot_baibot_container_image_registry_prefix_upstream }}" matrix_bot_baibot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_baibot_container_image_self_build else matrix_bot_baibot_container_image_registry_prefix_upstream }}"
matrix_bot_baibot_container_image_registry_prefix_upstream: "{{ matrix_bot_baibot_container_image_registry_prefix_upstream_default }}" matrix_bot_baibot_container_image_registry_prefix_upstream: "{{ matrix_bot_baibot_container_image_registry_prefix_upstream_default }}"
matrix_bot_baibot_container_image_registry_prefix_upstream_default: "ghcr.io/" matrix_bot_baibot_container_image_registry_prefix_upstream_default: "ghcr.io/"
matrix_bot_baibot_container_image_force_pull: "{{ matrix_bot_baibot_container_image.endswith(':latest') }}"
matrix_bot_baibot_base_path: "{{ matrix_base_data_path }}/baibot" matrix_bot_baibot_base_path: "{{ matrix_base_data_path }}/baibot"
matrix_bot_baibot_config_path: "{{ matrix_bot_baibot_base_path }}/config" matrix_bot_baibot_config_path: "{{ matrix_bot_baibot_base_path }}/config"

15
roles/custom/matrix-bot-baibot/tasks/install.yml
View File

@@ -38,11 +38,9 @@
register: matrix_bot_baibot_env_result register: matrix_bot_baibot_env_result
- name: Ensure baibot container image is pulled - name: Ensure baibot container image is pulled
community.docker.docker_image: community.docker.docker_image_pull:
name: "{{ matrix_bot_baibot_container_image }}" name: "{{ matrix_bot_baibot_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" pull: always
force_source: "{{ matrix_bot_baibot_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_bot_baibot_container_image_force_pull }}"
when: "not matrix_bot_baibot_container_image_self_build | bool" when: "not matrix_bot_baibot_container_image_self_build | bool"
register: matrix_bot_baibot_container_image_pull_result register: matrix_bot_baibot_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -62,15 +60,13 @@
register: matrix_bot_baibot_git_pull_results register: matrix_bot_baibot_git_pull_results
- name: Ensure baibot container image is built - name: Ensure baibot container image is built
community.docker.docker_image: community.docker.docker_image_build:
name: "{{ matrix_bot_baibot_container_image }}" name: "{{ matrix_bot_baibot_container_image }}"
source: build
force_source: "{{ matrix_bot_baibot_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_bot_baibot_git_pull_results.changed }}"
build:
dockerfile: Dockerfile dockerfile: Dockerfile
path: "{{ matrix_bot_baibot_container_src_files_path }}" path: "{{ matrix_bot_baibot_container_src_files_path }}"
pull: true pull: true
rebuild: "{{ 'always' if matrix_bot_baibot_git_pull_results.changed | bool else 'never' }}"
register: matrix_bot_baibot_container_image_build_result
- name: Ensure baibot container network is created - name: Ensure baibot container network is created
community.general.docker_network: community.general.docker_network:
@@ -94,4 +90,5 @@
or matrix_bot_baibot_env_result.changed | default(false) or matrix_bot_baibot_env_result.changed | default(false)
or matrix_bot_baibot_systemd_service_result.changed | default(false) or matrix_bot_baibot_systemd_service_result.changed | default(false)
or matrix_bot_baibot_container_image_pull_result.changed | default(false) or matrix_bot_baibot_container_image_pull_result.changed | default(false)
or matrix_bot_baibot_container_image_build_result.changed | default(false)
}} }}

1
roles/custom/matrix-bot-baibot/tasks/validate_config.yml
View File

@@ -91,3 +91,4 @@
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_bot_baibot_container_image_name_prefix', 'new': 'matrix_bot_baibot_container_image_registry_prefix'} - {'old': 'matrix_bot_baibot_container_image_name_prefix', 'new': 'matrix_bot_baibot_container_image_registry_prefix'}
- {'old': 'matrix_bot_baibot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}