mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-05-10 17:24:36 +00:00
matrix-bridge-mx-puppet-groupme: switch to modern community.docker docker_image modules
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:
@@ -29,7 +29,6 @@ matrix_mx_puppet_groupme_container_image: "{{ matrix_mx_puppet_groupme_container
|
|||||||
matrix_mx_puppet_groupme_container_image_registry_prefix: "{{ 'localhost/' if matrix_mx_puppet_groupme_container_image_self_build else matrix_mx_puppet_groupme_container_image_registry_prefix_upstream }}"
|
matrix_mx_puppet_groupme_container_image_registry_prefix: "{{ 'localhost/' if matrix_mx_puppet_groupme_container_image_self_build else matrix_mx_puppet_groupme_container_image_registry_prefix_upstream }}"
|
||||||
matrix_mx_puppet_groupme_container_image_registry_prefix_upstream: "{{ matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default }}"
|
matrix_mx_puppet_groupme_container_image_registry_prefix_upstream: "{{ matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default }}"
|
||||||
matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default: "registry.gitlab.com/"
|
matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default: "registry.gitlab.com/"
|
||||||
matrix_mx_puppet_groupme_container_image_force_pull: "{{ matrix_mx_puppet_groupme_container_image.endswith(':latest') }}"
|
|
||||||
|
|
||||||
matrix_mx_puppet_groupme_base_path: "{{ matrix_base_data_path }}/mx-puppet-groupme"
|
matrix_mx_puppet_groupme_base_path: "{{ matrix_base_data_path }}/mx-puppet-groupme"
|
||||||
matrix_mx_puppet_groupme_config_path: "{{ matrix_mx_puppet_groupme_base_path }}/config"
|
matrix_mx_puppet_groupme_config_path: "{{ matrix_mx_puppet_groupme_base_path }}/config"
|
||||||
|
|||||||
@@ -73,11 +73,9 @@
|
|||||||
matrix_mx_puppet_groupme_migration_requires_restart: true
|
matrix_mx_puppet_groupme_migration_requires_restart: true
|
||||||
|
|
||||||
- name: Ensure MX Puppet Groupme image is pulled
|
- name: Ensure MX Puppet Groupme image is pulled
|
||||||
community.docker.docker_image:
|
community.docker.docker_image_pull:
|
||||||
name: "{{ matrix_mx_puppet_groupme_container_image }}"
|
name: "{{ matrix_mx_puppet_groupme_container_image }}"
|
||||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
pull: always
|
||||||
force_source: "{{ matrix_mx_puppet_groupme_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_mx_puppet_groupme_container_image_force_pull }}"
|
|
||||||
when: matrix_mx_puppet_groupme_enabled | bool and not matrix_mx_puppet_groupme_container_image_self_build
|
when: matrix_mx_puppet_groupme_enabled | bool and not matrix_mx_puppet_groupme_container_image_self_build
|
||||||
register: matrix_mx_puppet_groupme_container_image_pull_result
|
register: matrix_mx_puppet_groupme_container_image_pull_result
|
||||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||||
@@ -96,16 +94,14 @@
|
|||||||
when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
|
when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
|
||||||
|
|
||||||
- name: Ensure MX Puppet Groupme Docker image is built
|
- name: Ensure MX Puppet Groupme Docker image is built
|
||||||
community.docker.docker_image:
|
community.docker.docker_image_build:
|
||||||
name: "{{ matrix_mx_puppet_groupme_container_image }}"
|
name: "{{ matrix_mx_puppet_groupme_container_image }}"
|
||||||
source: build
|
dockerfile: Dockerfile
|
||||||
force_source: "{{ matrix_mx_puppet_groupme_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
|
path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
|
||||||
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mx_puppet_groupme_git_pull_results.changed }}"
|
pull: true
|
||||||
build:
|
rebuild: "{{ 'always' if matrix_mx_puppet_groupme_git_pull_results.changed | bool else 'never' }}"
|
||||||
dockerfile: Dockerfile
|
|
||||||
path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
|
|
||||||
pull: true
|
|
||||||
when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
|
when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
|
||||||
|
register: matrix_mx_puppet_groupme_container_image_build_result
|
||||||
|
|
||||||
- name: Ensure mx-puppet-groupme config.yaml installed
|
- name: Ensure mx-puppet-groupme config.yaml installed
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
@@ -148,6 +144,7 @@
|
|||||||
or matrix_mx_puppet_groupme_registration_result.changed | default(false)
|
or matrix_mx_puppet_groupme_registration_result.changed | default(false)
|
||||||
or matrix_mx_puppet_groupme_systemd_service_result.changed | default(false)
|
or matrix_mx_puppet_groupme_systemd_service_result.changed | default(false)
|
||||||
or matrix_mx_puppet_groupme_container_image_pull_result.changed | default(false)
|
or matrix_mx_puppet_groupme_container_image_pull_result.changed | default(false)
|
||||||
|
or matrix_mx_puppet_groupme_container_image_build_result.changed | default(false)
|
||||||
}}
|
}}
|
||||||
|
|
||||||
- name: Ensure matrix-mx-puppet-groupme.service restarted, if necessary
|
- name: Ensure matrix-mx-puppet-groupme.service restarted, if necessary
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
- {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream'}
|
- {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream'}
|
||||||
- {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default'}
|
- {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix_upstream_default'}
|
||||||
- {'old': 'matrix_mx_puppet_groupme_docker_src_files_path', 'new': 'matrix_mx_puppet_groupme_container_src_files_path'}
|
- {'old': 'matrix_mx_puppet_groupme_docker_src_files_path', 'new': 'matrix_mx_puppet_groupme_container_src_files_path'}
|
||||||
|
- {'old': 'matrix_mx_puppet_groupme_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
|
||||||
|
|
||||||
- name: Fail if required mx-puppet-groupme settings not defined
|
- name: Fail if required mx-puppet-groupme settings not defined
|
||||||
ansible.builtin.fail:
|
ansible.builtin.fail:
|
||||||
|
|||||||
Reference in New Issue
Block a user