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-pantalaimon: 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:24:04 +03:00
parent d943939f28
commit ac7f805dcc
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-pantalaimon/defaults/main.yml
-1
View File
@@ -19,7 +19,6 @@ matrix_pantalaimon_container_image: "{{ matrix_pantalaimon_container_image_regis
matrix_pantalaimon_container_image_registry_prefix: "{{ 'localhost/' if matrix_pantalaimon_container_image_self_build else matrix_pantalaimon_container_image_registry_prefix_upstream }}"
matrix_pantalaimon_container_image_registry_prefix_upstream: "{{ matrix_pantalaimon_container_image_registry_prefix_upstream_default }}"
matrix_pantalaimon_container_image_registry_prefix_upstream_default: "docker.io/"
matrix_pantalaimon_container_image_force_pull: "{{ matrix_pantalaimon_container_image.endswith(':latest') }}"
matrix_pantalaimon_base_path: "{{ matrix_base_data_path }}/pantalaimon"
matrix_pantalaimon_data_path: "{{ matrix_pantalaimon_base_path }}/data"
roles/custom/matrix-pantalaimon/tasks/install.yml
+9 -11
View File
@@ -28,11 +28,9 @@
register: matrix_pantalaimon_config_result
- name: Ensure pantalaimon container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_pantalaimon_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_pantalaimon_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_pantalaimon_container_image_force_pull }}"
pull: always
when: "not matrix_pantalaimon_container_image_self_build | bool"
register: matrix_pantalaimon_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,15 +49,14 @@
when: "matrix_pantalaimon_container_image_self_build | bool"
- name: Ensure pantalaimon container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_pantalaimon_container_image }}"
source: build
force_source: "{{ matrix_pantalaimon_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_pantalaimon_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_pantalaimon_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_pantalaimon_git_pull_results.changed | bool else 'never' }}"
when: "matrix_pantalaimon_container_image_self_build | bool"
register: matrix_pantalaimon_container_image_build_result
- name: Ensure pantalaimon container network is created
community.general.docker_network:
@@ -82,4 +79,5 @@
matrix_pantalaimon_config_result.changed | default(false)
or matrix_pantalaimon_systemd_service_result.changed | default(false)
or matrix_pantalaimon_container_image_pull_result.changed | default(false)
or matrix_pantalaimon_container_image_build_result.changed | default(false)
}}
roles/custom/matrix-pantalaimon/tasks/validate_config.yml
+1
View File
@@ -16,6 +16,7 @@
- {'old': 'matrix_pantalaimon_docker_image_registry_prefix', 'new': 'matrix_pantalaimon_container_image_registry_prefix'}
- {'old': 'matrix_pantalaimon_docker_image_registry_prefix_upstream', 'new': 'matrix_pantalaimon_container_image_registry_prefix_upstream'}
- {'old': 'matrix_pantalaimon_docker_image_registry_prefix_upstream_default', 'new': 'matrix_pantalaimon_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_pantalaimon_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- name: Fail if required Pantalaimon variables are undefined
ansible.builtin.fail: