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

matrix-cactus-comments: 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:09:37 +03:00
parent a1695ff347
commit a80eac6c72
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-cactus-comments/defaults/main.yml
-1
View File
@@ -38,7 +38,6 @@ matrix_cactus_comments_container_image_registry_prefix: "{{ 'localhost/' if matr
matrix_cactus_comments_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_container_image_registry_prefix_upstream_default }}"
matrix_cactus_comments_container_image_registry_prefix_upstream_default: docker.io/
matrix_cactus_comments_container_image_tag: "{{ matrix_cactus_comments_version }}"
matrix_cactus_comments_container_image_force_pull: "{{ matrix_cactus_comments_container_image.endswith(':latest') }}"
matrix_cactus_comments_container_network: ""
roles/custom/matrix-cactus-comments/tasks/setup_install.yml
+9 -12
View File
@@ -38,11 +38,9 @@
register: matrix_cactus_comments_config_appservice_result
- name: Ensure matrix-cactus-comments image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_cactus_comments_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_cactus_comments_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_cactus_comments_container_image_force_pull }}"
pull: always
when: "not matrix_cactus_comments_container_image_self_build | bool"
register: matrix_cactus_comments_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -61,16 +59,14 @@
when: "matrix_cactus_comments_container_image_self_build | bool"
- name: Ensure matrix-cactus-comments image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_cactus_comments_container_image }}"
source: build
force_source: "{{ matrix_cactus_comments_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_cactus_comments_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_cactus_comments_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_cactus_comments_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_cactus_comments_git_pull_results.changed | bool else 'never' }}"
when: "matrix_cactus_comments_container_image_self_build | bool"
register: matrix_cactus_comments_container_image_build_result
- name: Ensure matrix-cactus-comments.service installed
ansible.builtin.template:
@@ -87,4 +83,5 @@
or matrix_cactus_comments_config_appservice_result.changed | default(false)
or matrix_cactus_comments_systemd_service_result.changed | default(false)
or matrix_cactus_comments_container_image_pull_result.changed | default(false)
or matrix_cactus_comments_container_image_build_result.changed | default(false)
}}
roles/custom/matrix-cactus-comments/tasks/validate_config.yml
+1
View File
@@ -28,6 +28,7 @@
- {'old': 'matrix_cactus_comments_docker_repo', 'new': 'matrix_cactus_comments_container_repo'}
- {'old': 'matrix_cactus_comments_docker_repo_version', 'new': 'matrix_cactus_comments_container_repo_version'}
- {'old': 'matrix_cactus_comments_docker_src_files_path', 'new': 'matrix_cactus_comments_container_src_files_path'}
- {'old': 'matrix_cactus_comments_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- name: Fail if required matrix-cactus-comments settings not defined
ansible.builtin.fail: