requirements.yml: bump 22 mash roles to versions using modern community.docker modules

These external roles were modernized to switch off the deprecated-shape
`community.docker.docker_image` module in favour of `docker_image_pull`
and `docker_image_build`, matching the in-tree role sweep.

Roles bumped: backup_borg, cinny, container_socket_proxy, coturn,
ddclient, etherpad, exim_relay, grafana, hydrogen, jitsi, livekit_server,
ntfy, postgres, postgres_backup, prometheus, prometheus_nginxlog_exporter,
prometheus_node_exporter, prometheus_postgres_exporter, sable, traefik,
traefik_certs_dumper, valkey.

Closes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/5191.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

requirements.yml

@@ -4,20 +4,20 @@
   version: v1.0.0-6
   name: auxiliary
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-backup_borg.git
-  version: v1.4.4-2.1.4-0
+  version: v1.4.4-2.1.4-1
   name: backup_borg
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-cinny.git
-  version: v4.11.1-1
+  version: v4.11.1-2
   name: cinny
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-container-socket-proxy.git
-  version: v0.4.2-4
+  version: v0.4.2-5
   name: container_socket_proxy
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-coturn.git
-  version: v4.9.0-1
+  version: v4.9.0-2
   name: coturn
   activation_prefix: coturn_
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-ddclient.git
-  version: v4.0.0-2
+  version: v4.0.0-3
   name: ddclient
   activation_prefix: ddclient_
 - src: git+https://github.com/geerlingguy/ansible-role-docker
@@ -27,25 +27,25 @@
   version: 542a2d68db4e9a8e9bb4b508052760b900c7dce6
   name: docker_sdk_for_python
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-etherpad.git
-  version: v2.7.2-0
+  version: v2.7.2-1
   name: etherpad
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-exim-relay.git
-  version: v4.99.1-r0-2-0
+  version: v4.99.1-r0-2-1
   name: exim_relay
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-grafana.git
-  version: v11.6.5-9
+  version: v11.6.5-10
   name: grafana
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-hydrogen.git
-  version: v0.5.1-3
+  version: v0.5.1-4
   name: hydrogen
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-jitsi.git
-  version: v10888-0
+  version: v10888-1
   name: jitsi
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-livekit-server.git
-  version: v1.11.0-1
+  version: v1.11.0-2
   name: livekit_server
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-ntfy.git
-  version: v2.22.0-0
+  version: v2.22.0-1
   name: ntfy
 - src: git+https://github.com/devture/com.devture.ansible.role.playbook_help.git
   version: ea8c5cc750c4e23d004c9a836dfd9eda82d45ff4
@@ -57,25 +57,25 @@
   version: dd6e15246b7a9a2d921e0b3f9cd8a4a917a1bb2f
   name: playbook_state_preserver
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres.git
-  version: v18.3-4
+  version: v18.3-5
   name: postgres
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-postgres-backup.git
-  version: v18-2
+  version: v18-3
   name: postgres_backup
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus.git
-  version: v3.11.3-0
+  version: v3.11.3-1
   name: prometheus
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-nginxlog-exporter.git
-  version: v1.10.0-2
+  version: v1.10.0-3
   name: prometheus_nginxlog_exporter
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-node-exporter.git
-  version: v1.10.2-0
+  version: v1.10.2-1
   name: prometheus_node_exporter
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-prometheus-postgres-exporter.git
-  version: v0.19.1-3
+  version: v0.19.1-4
   name: prometheus_postgres_exporter
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-sable.git
-  version: v1.14.0-0
+  version: v1.14.0-1
   name: sable
 - src: git+https://github.com/devture/com.devture.ansible.role.systemd_docker_base.git
   version: v1.5.0-0
@@ -87,11 +87,11 @@
   version: v1.1.0-1
   name: timesync
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik.git
-  version: v3.6.15-0
+  version: v3.6.15-1
   name: traefik
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-traefik-certs-dumper.git
-  version: v2.10.0-6
+  version: v2.10.0-7
   name: traefik_certs_dumper
 - src: git+https://github.com/mother-of-all-self-hosting/ansible-role-valkey.git
-  version: v9.0.3-3
+  version: v9.0.3-4
   name: valkey

roles/custom/matrix-alertmanager-receiver/defaults/main.yml

@@ -32,7 +32,6 @@ matrix_alertmanager_receiver_container_src_path: "{{ matrix_alertmanager_receive
 
 matrix_alertmanager_receiver_container_image: "{{ matrix_alertmanager_receiver_container_image_registry_prefix }}metio/matrix-alertmanager-receiver:{{ matrix_alertmanager_receiver_container_image_tag }}"
 matrix_alertmanager_receiver_container_image_tag: "{{ matrix_alertmanager_receiver_version }}"
-matrix_alertmanager_receiver_container_image_force_pull: "{{ matrix_alertmanager_receiver_container_image.endswith(':main') }}"
 matrix_alertmanager_receiver_container_image_registry_prefix: "{{ matrix_alertmanager_receiver_container_image_registry_prefix_upstream }}"
 matrix_alertmanager_receiver_container_image_registry_prefix_upstream: "{{ matrix_alertmanager_receiver_container_image_registry_prefix_upstream_default }}"
 matrix_alertmanager_receiver_container_image_registry_prefix_upstream_default: "docker.io/"

roles/custom/matrix-alertmanager-receiver/tasks/install.yml

@@ -42,11 +42,9 @@
   register: matrix_alertmanager_receiver_support_files_result
 
 - name: Ensure matrix-alertmanager-receiver container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_alertmanager_receiver_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_alertmanager_receiver_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_alertmanager_receiver_container_image_force_pull }}"
+    pull: always
   when: "not matrix_alertmanager_receiver_container_image_self_build | bool"
   register: matrix_alertmanager_receiver_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"

roles/custom/matrix-alertmanager-receiver/tasks/validate_config.yml

@@ -24,6 +24,7 @@
   when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
   with_items:
     - {'old': 'matrix_alertmanager_receiver_container_image_name_prefix', 'new': 'matrix_alertmanager_receiver_container_image_registry_prefix'}
+    - {'old': 'matrix_alertmanager_receiver_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_alertmanager_receiver_config_templating_computed_values', 'new': '<superseded by logic in the firing or resolved template; see https://github.com/metio/matrix-alertmanager-receiver/pull/94'}
     - {'old': 'matrix_alertmanager_receiver_config_templating_computed_values_auto', 'new': '<superseded by logic in the firing or resolved template; see https://github.com/metio/matrix-alertmanager-receiver/pull/94'}
     - {'old': 'matrix_alertmanager_receiver_config_templating_computed_values_custom', 'new': '<superseded by logic in the firing or resolved template; see https://github.com/metio/matrix-alertmanager-receiver/pull/94'}

roles/custom/matrix-authentication-service/defaults/main.yml

@@ -27,7 +27,6 @@ matrix_authentication_service_container_image_registry_prefix: "{{ 'localhost/'
 matrix_authentication_service_container_image_registry_prefix_upstream: "{{ matrix_authentication_service_container_image_registry_prefix_upstream_default }}"
 matrix_authentication_service_container_image_registry_prefix_upstream_default: "ghcr.io/"
 matrix_authentication_service_container_image: "{{ matrix_authentication_service_container_image_registry_prefix }}element-hq/matrix-authentication-service:{{ matrix_authentication_service_version }}"
-matrix_authentication_service_container_image_force_pull: "{{ matrix_authentication_service_container_image.endswith(':latest') }}"
 
 matrix_authentication_service_base_path: "{{ matrix_base_data_path }}/matrix-authentication-service"
 matrix_authentication_service_bin_path: "{{ matrix_authentication_service_base_path }}/bin"

roles/custom/matrix-authentication-service/tasks/install.yml

@@ -84,11 +84,9 @@
   register: matrix_authentication_service_support_files_result
 
 - name: Ensure Matrix Authentication Service container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_authentication_service_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_authentication_service_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_authentication_service_container_image_force_pull }}"
+    pull: always
   when: "not matrix_authentication_service_container_image_self_build | bool"
   register: matrix_authentication_service_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"

roles/custom/matrix-authentication-service/tasks/validate_config.yml

@@ -53,3 +53,4 @@
     - {'old': 'matrix_authentication_service_syn2mas_container_image_self_build', 'new': '<removed>'}
     - {'old': 'matrix_authentication_service_syn2mas_process_extra_arguments', 'new': 'matrix_authentication_service_syn2mas_command_extra_options or matrix_authentication_service_syn2mas_subcommand_extra_options'}
     - {'old': 'matrix_authentication_service_syn2mas_dry_run', 'new': 'matrix_authentication_service_syn2mas_migrate_dry_run'}
+    - {'old': 'matrix_authentication_service_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

roles/custom/matrix-bot-baibot/defaults/main.yml

@@ -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_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_force_pull: "{{ matrix_bot_baibot_container_image.endswith(':latest') }}"
 
 matrix_bot_baibot_base_path: "{{ matrix_base_data_path }}/baibot"
 matrix_bot_baibot_config_path: "{{ matrix_bot_baibot_base_path }}/config"

roles/custom/matrix-bot-baibot/tasks/install.yml

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

roles/custom/matrix-bot-baibot/tasks/validate_config.yml

@@ -91,3 +91,4 @@
   when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
   with_items:
     - {'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)'}

roles/custom/matrix-bot-buscarron/defaults/main.yml

@@ -40,7 +40,6 @@ matrix_bot_buscarron_container_image: "{{ matrix_bot_buscarron_container_image_r
 matrix_bot_buscarron_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else matrix_bot_buscarron_container_image_registry_prefix_upstream }}"
 matrix_bot_buscarron_container_image_registry_prefix_upstream: "{{ matrix_bot_buscarron_container_image_registry_prefix_upstream_default }}"
 matrix_bot_buscarron_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_bot_buscarron_container_image_force_pull: "{{ matrix_bot_buscarron_container_image.endswith(':latest') }}"
 
 # The base container network. It will be auto-created by this role if it doesn't exist already.
 matrix_bot_buscarron_container_network: matrix-bot-buscarron

roles/custom/matrix-bot-buscarron/tasks/setup_install.yml

@@ -61,11 +61,9 @@
   register: matrix_bot_buscarron_support_files_result
 
 - name: Ensure Buscarron image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_buscarron_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_buscarron_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_buscarron_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_buscarron_container_image_self_build | bool"
   register: matrix_bot_buscarron_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -84,16 +82,14 @@
   when: "matrix_bot_buscarron_container_image_self_build | bool"
 
 - name: Ensure Buscarron image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_bot_buscarron_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_buscarron_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_buscarron_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_buscarron_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_bot_buscarron_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_bot_buscarron_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_bot_buscarron_container_image_self_build | bool"
+  register: matrix_bot_buscarron_container_image_build_result
 
 - name: Ensure matrix-bot-buscarron.service installed
   ansible.builtin.template:
@@ -110,6 +106,7 @@
         or matrix_bot_buscarron_support_files_result.changed | default(false)
         or matrix_bot_buscarron_systemd_service_result.changed | default(false)
         or matrix_bot_buscarron_container_image_pull_result.changed | default(false)
+        or matrix_bot_buscarron_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure Buscarron container network is created

roles/custom/matrix-bot-buscarron/tasks/validate_config.yml

@@ -19,6 +19,7 @@
     - {'old': 'matrix_bot_buscarron_container_image_name_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'}
     - {'old': 'matrix_bot_buscarron_docker_image', 'new': 'matrix_bot_buscarron_container_image'}
     - {'old': 'matrix_bot_buscarron_docker_image_force_pull', 'new': 'matrix_bot_buscarron_container_image_force_pull'}
+    - {'old': 'matrix_bot_buscarron_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'}
     - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream_default'}

roles/custom/matrix-bot-go-neb/defaults/main.yml

@@ -36,7 +36,6 @@ matrix_bot_go_neb_data_store_path: "{{ matrix_bot_go_neb_data_path }}/store"
 
 matrix_bot_go_neb_container_image: "{{ matrix_bot_go_neb_container_image_registry_prefix }}matrixdotorg/go-neb:{{ matrix_bot_go_neb_container_image_tag }}"
 matrix_bot_go_neb_container_image_tag: "{{ matrix_bot_go_neb_version }}"
-matrix_bot_go_neb_container_image_force_pull: "{{ matrix_bot_go_neb_container_image.endswith(':latest') }}"
 matrix_bot_go_neb_container_image_registry_prefix: "{{ matrix_bot_go_neb_container_image_registry_prefix_upstream }}"
 matrix_bot_go_neb_container_image_registry_prefix_upstream: "{{ matrix_bot_go_neb_container_image_registry_prefix_upstream_default }}"
 matrix_bot_go_neb_container_image_registry_prefix_upstream_default: "docker.io/"

roles/custom/matrix-bot-go-neb/tasks/install.yml

@@ -45,11 +45,9 @@
   register: matrix_bot_go_neb_support_files_result
 
 - name: Ensure go-neb container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_go_neb_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_go_neb_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_go_neb_container_image_force_pull }}"
+    pull: always
   register: matrix_bot_go_neb_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"

roles/custom/matrix-bot-go-neb/tasks/validate_config.yml

@@ -16,3 +16,11 @@
     msg: >-
       You need at least 1 service in the matrix_bot_go_neb_services block.
   when: matrix_bot_go_neb_services is not defined or matrix_bot_go_neb_services[0] is not defined
+
+- name: (Deprecation) Catch and report renamed matrix-bot-go-neb variables
+  ansible.builtin.fail:
+    msg: >-
+      The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
+  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
+  with_items:
+    - {'old': 'matrix_bot_go_neb_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

roles/custom/matrix-bot-honoroit/defaults/main.yml

@@ -35,7 +35,6 @@ matrix_bot_honoroit_container_image: "{{ matrix_bot_honoroit_container_image_reg
 matrix_bot_honoroit_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_honoroit_container_image_self_build else matrix_bot_honoroit_container_image_registry_prefix_upstream }}"
 matrix_bot_honoroit_container_image_registry_prefix_upstream: "{{ matrix_bot_honoroit_container_image_registry_prefix_upstream_default }}"
 matrix_bot_honoroit_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_bot_honoroit_container_image_force_pull: "{{ matrix_bot_honoroit_container_image.endswith(':latest') }}"
 
 matrix_bot_honoroit_base_path: "{{ matrix_base_data_path }}/honoroit"
 matrix_bot_honoroit_config_path: "{{ matrix_bot_honoroit_base_path }}/config"

roles/custom/matrix-bot-honoroit/tasks/setup_install.yml

@@ -63,11 +63,9 @@
   register: matrix_bot_honoroit_support_files_result
 
 - name: Ensure Honoroit image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_honoroit_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_honoroit_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_honoroit_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_honoroit_container_image_self_build | bool"
   register: matrix_bot_honoroit_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -86,16 +84,14 @@
   when: "matrix_bot_honoroit_container_image_self_build | bool"
 
 - name: Ensure Honoroit image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_bot_honoroit_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_honoroit_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_honoroit_container_image_self_build.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_honoroit_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_bot_honoroit_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_bot_honoroit_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_bot_honoroit_container_image_self_build | bool"
+  register: matrix_bot_honoroit_container_image_build_result
 
 - name: Ensure Honoroit container network is created
   community.general.docker_network:
@@ -119,6 +115,7 @@
         or matrix_bot_honoroit_support_files_result.changed | default(false)
         or matrix_bot_honoroit_systemd_service_result.changed | default(false)
         or matrix_bot_honoroit_container_image_pull_result.changed | default(false)
+        or matrix_bot_honoroit_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-bot-honoroit.service restarted, if necessary

roles/custom/matrix-bot-honoroit/tasks/validate_config.yml

@@ -16,6 +16,7 @@
     - {'old': 'matrix_bot_honoroit_container_image_name_prefix', 'new': 'matrix_bot_honoroit_container_image_registry_prefix'}
     - {'old': 'matrix_bot_honoroit_docker_image', 'new': 'matrix_bot_honoroit_container_image'}
     - {'old': 'matrix_bot_honoroit_docker_image_force_pull', 'new': 'matrix_bot_honoroit_container_image_force_pull'}
+    - {'old': 'matrix_bot_honoroit_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_bot_honoroit_docker_image_registry_prefix', 'new': 'matrix_bot_honoroit_container_image_registry_prefix'}
     - {'old': 'matrix_bot_honoroit_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_honoroit_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_bot_honoroit_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_honoroit_container_image_registry_prefix_upstream_default'}

roles/custom/matrix-bot-matrix-registration-bot/defaults/main.yml

@@ -26,7 +26,6 @@ matrix_bot_matrix_registration_bot_container_image: "{{ matrix_bot_matrix_regist
 matrix_bot_matrix_registration_bot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_matrix_registration_bot_container_image_self_build else matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream }}"
 matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream: "{{ matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream_default }}"
 matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_bot_matrix_registration_bot_container_image_force_pull: "{{ matrix_bot_matrix_registration_bot_container_image.endswith(':latest') }}"
 
 matrix_bot_matrix_registration_bot_base_path: "{{ matrix_base_data_path }}/matrix-registration-bot"
 matrix_bot_matrix_registration_bot_config_path: "{{ matrix_bot_matrix_registration_bot_base_path }}/config"

roles/custom/matrix-bot-matrix-registration-bot/tasks/setup_install.yml

@@ -31,11 +31,9 @@
   register: matrix_bot_matrix_registration_bot_config_result
 
 - name: Ensure matrix-registration-bot image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_matrix_registration_bot_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_matrix_registration_bot_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_matrix_registration_bot_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_matrix_registration_bot_container_image_self_build | bool"
   register: matrix_bot_matrix_registration_bot_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -55,15 +53,13 @@
       register: matrix_bot_matrix_registration_bot_git_pull_results
 
     - name: Ensure matrix-registration-bot image is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_bot_matrix_registration_bot_container_image }}"
-        source: build
-        force_source: "{{ matrix_bot_matrix_registration_bot_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_matrix_registration_bot_git_pull_results.changed }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_bot_matrix_registration_bot_container_src_files_path }}"
-          pull: true
+        dockerfile: Dockerfile
+        path: "{{ matrix_bot_matrix_registration_bot_container_src_files_path }}"
+        pull: true
+        rebuild: "{{ 'always' if matrix_bot_matrix_registration_bot_git_pull_results.changed | bool else 'never' }}"
+      register: matrix_bot_matrix_registration_bot_container_image_build_result
 
 - name: Ensure matrix-registration-bot container network is created
   community.general.docker_network:
@@ -86,4 +82,5 @@
         matrix_bot_matrix_registration_bot_config_result.changed | default(false)
         or matrix_bot_matrix_registration_bot_systemd_service_result.changed | default(false)
         or matrix_bot_matrix_registration_bot_container_image_pull_result.changed | default(false)
+        or matrix_bot_matrix_registration_bot_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bot-matrix-registration-bot/tasks/validate_config.yml

@@ -16,7 +16,8 @@
     - {'old': 'matrix_bot_matrix_registration_bot_bot_access_token', 'new': '<removed>'}
     - {'old': 'matrix_bot_matrix_registration_bot_matrix_homeserver_url', 'new': 'matrix_bot_matrix_registration_bot_api_base_url'}
     - {'old': 'matrix_bot_matrix_registration_bot_docker_image', 'new': 'matrix_bot_matrix_registration_bot_container_image'}
-    - {'old': 'matrix_bot_matrix_registration_bot_docker_image_force_pull', 'new': 'matrix_bot_matrix_registration_bot_container_image_force_pull'}
+    - {'old': 'matrix_bot_matrix_registration_bot_docker_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
+    - {'old': 'matrix_bot_matrix_registration_bot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_bot_matrix_registration_bot_docker_image_registry_prefix', 'new': 'matrix_bot_matrix_registration_bot_container_image_registry_prefix'}
     - {'old': 'matrix_bot_matrix_registration_bot_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_bot_matrix_registration_bot_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_matrix_registration_bot_container_image_registry_prefix_upstream_default'}

roles/custom/matrix-bot-matrix-reminder-bot/defaults/main.yml

@@ -25,7 +25,6 @@ matrix_bot_matrix_reminder_bot_container_image: "{{ matrix_bot_matrix_reminder_b
 matrix_bot_matrix_reminder_bot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_matrix_reminder_bot_container_image_self_build else matrix_bot_matrix_reminder_bot_container_image_registry_prefix_upstream }}"
 matrix_bot_matrix_reminder_bot_container_image_registry_prefix_upstream: "{{ matrix_bot_matrix_reminder_bot_container_image_registry_prefix_upstream_default }}"
 matrix_bot_matrix_reminder_bot_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_bot_matrix_reminder_bot_container_image_force_pull: "{{ matrix_bot_matrix_reminder_bot_container_image.endswith(':latest') }}"
 
 matrix_bot_matrix_reminder_bot_base_path: "{{ matrix_base_data_path }}/matrix-reminder-bot"
 matrix_bot_matrix_reminder_bot_config_path: "{{ matrix_bot_matrix_reminder_bot_base_path }}/config"

roles/custom/matrix-bot-matrix-reminder-bot/tasks/setup_install.yml

@@ -53,11 +53,9 @@
   when: "item.when | bool"
 
 - name: Ensure matrix-reminder-bot image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_matrix_reminder_bot_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_matrix_reminder_bot_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_matrix_reminder_bot_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_matrix_reminder_bot_container_image_self_build | bool"
   register: matrix_bot_matrix_reminder_bot_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -76,16 +74,14 @@
   when: "matrix_bot_matrix_reminder_bot_container_image_self_build | bool"
 
 - name: Ensure matrix-reminder-bot image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_bot_matrix_reminder_bot_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_matrix_reminder_bot_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_matrix_reminder_bot_git_pull_results.changed }}"
-    build:
-      dockerfile: docker/Dockerfile
-      path: "{{ matrix_bot_matrix_reminder_bot_container_src_files_path }}"
-      pull: true
+    dockerfile: docker/Dockerfile
+    path: "{{ matrix_bot_matrix_reminder_bot_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_bot_matrix_reminder_bot_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_bot_matrix_reminder_bot_container_image_self_build | bool"
+  register: matrix_bot_matrix_reminder_bot_container_image_build_result
 
 - name: Ensure matrix-reminder-bot config installed
   ansible.builtin.copy:
@@ -118,6 +114,7 @@
         or matrix_bot_matrix_reminder_bot_config_result.changed | default(false)
         or matrix_bot_matrix_reminder_bot_systemd_service_result.changed | default(false)
         or matrix_bot_matrix_reminder_bot_container_image_pull_result.changed | default(false)
+        or matrix_bot_matrix_reminder_bot_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-bot-matrix-reminder-bot.service restarted, if necessary

roles/custom/matrix-bot-matrix-reminder-bot/tasks/validate_config.yml

@@ -23,6 +23,7 @@
     - {'old': 'matrix_bot_matrix_reminder_bot_docker_repo', 'new': 'matrix_bot_matrix_reminder_bot_container_repo'}
     - {'old': 'matrix_bot_matrix_reminder_bot_docker_repo_version', 'new': 'matrix_bot_matrix_reminder_bot_container_repo_version'}
     - {'old': 'matrix_bot_matrix_reminder_bot_docker_src_files_path', 'new': 'matrix_bot_matrix_reminder_bot_container_src_files_path'}
+    - {'old': 'matrix_bot_matrix_reminder_bot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required matrix-reminder-bot settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bot-maubot/defaults/main.yml

@@ -35,7 +35,6 @@ matrix_bot_maubot_container_image: "{{ matrix_bot_maubot_container_image_registr
 matrix_bot_maubot_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_maubot_container_image_self_build else matrix_bot_maubot_container_image_registry_prefix_upstream }}"
 matrix_bot_maubot_container_image_registry_prefix_upstream: "{{ matrix_bot_maubot_container_image_registry_prefix_upstream_default }}"
 matrix_bot_maubot_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_bot_maubot_container_image_force_pull: "{{ matrix_bot_maubot_container_image.endswith(':latest') }}"
 
 # matrix_bot_maubot_container_image_customized is the name of the locally built maubot image
 # which adds various customizations on top of the original (upstream) maubot image.

roles/custom/matrix-bot-maubot/tasks/setup_install.yml

@@ -37,11 +37,9 @@
   register: matrix_bot_maubot_config_result
 
 - name: Ensure maubot image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_maubot_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_maubot_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_maubot_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_maubot_container_image_self_build|bool"
   register: matrix_bot_maubot_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -61,15 +59,13 @@
       register: matrix_bot_maubot_git_pull_results
 
     - name: Ensure maubot image is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_bot_maubot_container_image }}"
-        source: build
-        force_source: "{{ matrix_bot_maubot_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_maubot_git_pull_results.changed }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_bot_maubot_container_src_files_path }}"
-          pull: true
+        dockerfile: Dockerfile
+        path: "{{ matrix_bot_maubot_container_src_files_path }}"
+        pull: true
+        rebuild: "{{ 'always' if matrix_bot_maubot_git_pull_results.changed | bool else 'never' }}"
+      register: matrix_bot_maubot_container_image_build_result
 
 - when: "matrix_bot_maubot_container_image_customizations_enabled | bool"
   block:
@@ -83,14 +79,12 @@
       register: matrix_bot_maubot_container_image_customizations_dockerfile_result
 
     - name: Ensure customized Docker image for maubot is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_bot_maubot_container_image_customized }}"
-        source: build
-        force_source: "{{ matrix_bot_maubot_container_image_customizations_dockerfile_result.changed or matrix_bot_maubot_container_image_customized_force_source }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_bot_maubot_customized_container_src_files_path }}"
-          nocache: "{{ matrix_bot_maubot_container_image_customized_build_nocache }}"
+        dockerfile: Dockerfile
+        path: "{{ matrix_bot_maubot_customized_container_src_files_path }}"
+        nocache: "{{ matrix_bot_maubot_container_image_customized_build_nocache }}"
+        rebuild: "{{ 'always' if (matrix_bot_maubot_container_image_customizations_dockerfile_result.changed or matrix_bot_maubot_container_image_customized_force_source) | bool else 'never' }}"
 
 - name: Ensure maubot support files installed
   ansible.builtin.template:
@@ -125,4 +119,5 @@
         or matrix_bot_maubot_support_files_result.changed | default(false)
         or matrix_bot_maubot_systemd_service_result.changed | default(false)
         or matrix_bot_maubot_container_image_pull_result.changed | default(false)
+        or matrix_bot_maubot_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bot-maubot/tasks/validate_config.yml

@@ -31,6 +31,7 @@
     - {'old': 'matrix_bot_maubot_docker_repo_version', 'new': 'matrix_bot_maubot_container_repo_version'}
     - {'old': 'matrix_bot_maubot_docker_src_files_path', 'new': 'matrix_bot_maubot_container_src_files_path'}
     - {'old': 'matrix_bot_maubot_customized_docker_src_files_path', 'new': 'matrix_bot_maubot_customized_container_src_files_path'}
+    - {'old': 'matrix_bot_maubot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required maubot settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bot-mjolnir/defaults/main.yml

@@ -26,7 +26,6 @@ matrix_bot_mjolnir_container_image: "{{ matrix_bot_mjolnir_container_image_regis
 matrix_bot_mjolnir_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_mjolnir_container_image_self_build else matrix_bot_mjolnir_container_image_registry_prefix_upstream }}"
 matrix_bot_mjolnir_container_image_registry_prefix_upstream: "{{ matrix_bot_mjolnir_container_image_registry_prefix_upstream_default }}"
 matrix_bot_mjolnir_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_bot_mjolnir_container_image_force_pull: "{{ matrix_bot_mjolnir_container_image.endswith(':latest') }}"
 
 matrix_bot_mjolnir_base_path: "{{ matrix_base_data_path }}/mjolnir"
 matrix_bot_mjolnir_config_path: "{{ matrix_bot_mjolnir_base_path }}/config"

roles/custom/matrix-bot-mjolnir/tasks/setup_install.yml

@@ -28,11 +28,9 @@
   when: "item.when | bool"
 
 - name: Ensure mjolnir Docker image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_bot_mjolnir_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_bot_mjolnir_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_mjolnir_container_image_force_pull }}"
+    pull: always
   when: "not matrix_bot_mjolnir_container_image_self_build | bool"
   register: matrix_bot_mjolnir_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,15 +49,14 @@
   when: "matrix_bot_mjolnir_container_image_self_build | bool"
 
 - name: Ensure mjolnir Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_bot_mjolnir_container_image }}"
-    source: build
-    force_source: "{{ matrix_bot_mjolnir_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_bot_mjolnir_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_bot_mjolnir_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_bot_mjolnir_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_bot_mjolnir_container_image_self_build | bool"
+  register: matrix_bot_mjolnir_container_image_build_result
 
 - name: Ensure matrix-bot-mjolnir config installed
   ansible.builtin.copy:
@@ -92,6 +89,7 @@
         or matrix_bot_mjolnir_config_result.changed | default(false)
         or matrix_bot_mjolnir_systemd_service_result.changed | default(false)
         or matrix_bot_mjolnir_container_image_pull_result.changed | default(false)
+        or matrix_bot_mjolnir_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-bot-mjolnir.service restarted, if necessary

roles/custom/matrix-bot-mjolnir/tasks/validate_config.yml

@@ -17,6 +17,7 @@
     - {'old': 'matrix_bot_mjolnir_container_image_name_prefix', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix'}
     - {'old': 'matrix_bot_mjolnir_docker_image', 'new': 'matrix_bot_mjolnir_container_image'}
     - {'old': 'matrix_bot_mjolnir_docker_image_force_pull', 'new': 'matrix_bot_mjolnir_container_image_force_pull'}
+    - {'old': 'matrix_bot_mjolnir_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_bot_mjolnir_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_mjolnir_container_image_registry_prefix_upstream_default'}

roles/custom/matrix-bridge-appservice-discord/defaults/main.yml

@@ -24,7 +24,6 @@ matrix_appservice_discord_container_image: "{{ matrix_appservice_discord_contain
 matrix_appservice_discord_container_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_discord_container_image_self_build else matrix_appservice_discord_container_image_registry_prefix_upstream }}"
 matrix_appservice_discord_container_image_registry_prefix_upstream: "{{ matrix_appservice_discord_container_image_registry_prefix_upstream_default }}"
 matrix_appservice_discord_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_appservice_discord_container_image_force_pull: "{{ matrix_appservice_discord_container_image.endswith(':latest') }}"
 
 matrix_appservice_discord_base_path: "{{ matrix_base_data_path }}/appservice-discord"
 matrix_appservice_discord_config_path: "{{ matrix_base_data_path }}/appservice-discord/config"

roles/custom/matrix-bridge-appservice-discord/tasks/setup_install.yml

@@ -41,11 +41,9 @@
             matrix_appservice_discord_migration_requires_restart: true
 
 - name: Ensure Appservice Discord image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_appservice_discord_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_appservice_discord_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_appservice_discord_container_image_force_pull }}"
+    pull: always
   register: matrix_appservice_discord_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"

roles/custom/matrix-bridge-appservice-discord/tasks/validate_config.yml

@@ -19,6 +19,7 @@
     - {'old': 'matrix_appservice_discord_docker_image_registry_prefix', 'new': 'matrix_appservice_discord_container_image_registry_prefix'}
     - {'old': 'matrix_appservice_discord_docker_image_registry_prefix_upstream', 'new': 'matrix_appservice_discord_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_appservice_discord_docker_image_registry_prefix_upstream_default', 'new': 'matrix_appservice_discord_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_appservice_discord_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required appservice-discord settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-appservice-irc/defaults/main.yml

@@ -39,7 +39,6 @@ matrix_appservice_irc_container_image_registry_prefix: "{{ 'localhost/' if matri
 matrix_appservice_irc_container_image_registry_prefix_upstream: "{{ matrix_appservice_irc_container_image_registry_prefix_upstream_default }}"
 matrix_appservice_irc_container_image_registry_prefix_upstream_default: docker.io/
 matrix_appservice_irc_container_image_tag: "{{ 'latest' if matrix_appservice_irc_version == 'latest' else ('release-' + matrix_appservice_irc_version) }}"
-matrix_appservice_irc_container_image_force_pull: "{{ matrix_appservice_irc_container_image.endswith(':latest') }}"
 
 matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"
 matrix_appservice_irc_config_path: "{{ matrix_appservice_irc_base_path }}/config"

roles/custom/matrix-bridge-appservice-irc/tasks/setup_install.yml

@@ -80,11 +80,9 @@
             matrix_appservice_irc_migration_requires_restart: true
 
 - name: Ensure Appservice IRC image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_appservice_irc_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_appservice_irc_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_appservice_irc_container_image_force_pull }}"
+    pull: always
   when: "matrix_appservice_irc_enabled | bool and not matrix_appservice_irc_container_image_self_build | bool"
   register: matrix_appservice_irc_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -103,16 +101,14 @@
   when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-irc Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_appservice_irc_container_image }}"
-    source: build
-    force_source: "{{ matrix_appservice_irc_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_appservice_irc_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_appservice_irc_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_appservice_irc_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_appservice_irc_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_appservice_irc_enabled | bool and matrix_appservice_irc_container_image_self_build | bool and matrix_appservice_irc_git_pull_results.changed"
+  register: matrix_appservice_irc_container_image_build_result
 
 - name: Ensure Matrix Appservice IRC config installed
   ansible.builtin.copy:
@@ -272,6 +268,7 @@
         or matrix_appservice_irc_registration_result.changed | default(false)
         or matrix_appservice_irc_systemd_service_result.changed | default(false)
         or matrix_appservice_irc_container_image_pull_result.changed | default(false)
+        or matrix_appservice_irc_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-appservice-irc.service restarted, if necessary

roles/custom/matrix-bridge-appservice-irc/tasks/validate_config.yml

@@ -26,6 +26,7 @@
     - {'old': 'matrix_appservice_irc_docker_repo', 'new': 'matrix_appservice_irc_container_repo'}
     - {'old': 'matrix_appservice_irc_docker_repo_version', 'new': 'matrix_appservice_irc_container_repo_version'}
     - {'old': 'matrix_appservice_irc_docker_src_files_path', 'new': 'matrix_appservice_irc_container_src_files_path'}
+    - {'old': 'matrix_appservice_irc_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required appservice-irc settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-appservice-kakaotalk/defaults/main.yml

@@ -39,14 +39,12 @@ matrix_appservice_kakaotalk_node_container_image: "{{ matrix_appservice_kakaotal
 matrix_appservice_kakaotalk_node_container_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_kakaotalk_container_image_self_build else matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream }}"
 matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream: "{{ matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default }}"
 matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default: ""
-matrix_appservice_kakaotalk_node_container_image_force_pull: "{{ matrix_appservice_kakaotalk_node_container_image.endswith(':latest') }}"
 
 matrix_appservice_kakaotalk_version: 86c038fd2ffee5e0aebf65136f085cce7e38b54e
 matrix_appservice_kakaotalk_container_image: "{{ matrix_appservice_kakaotalk_container_image_registry_prefix }}fair/matrix-appservice-kakaotalk:{{ matrix_appservice_kakaotalk_version }}"
 matrix_appservice_kakaotalk_container_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_kakaotalk_container_image_self_build else matrix_appservice_kakaotalk_container_image_registry_prefix_upstream }}"
 matrix_appservice_kakaotalk_container_image_registry_prefix_upstream: "{{ matrix_appservice_kakaotalk_container_image_registry_prefix_upstream_default }}"
 matrix_appservice_kakaotalk_container_image_registry_prefix_upstream_default: ""
-matrix_appservice_kakaotalk_container_image_force_pull: "{{ matrix_appservice_kakaotalk_container_image.endswith(':latest') }}"
 
 matrix_appservice_kakaotalk_base_path: "{{ matrix_base_data_path }}/appservice-kakaotalk"
 matrix_appservice_kakaotalk_config_path: "{{ matrix_appservice_kakaotalk_base_path }}/config"

roles/custom/matrix-bridge-appservice-kakaotalk/tasks/setup_install.yml

@@ -7,11 +7,9 @@
 ---
 
 - name: Ensure matrix-appservice-kakaotalk image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_appservice_kakaotalk_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_appservice_kakaotalk_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_appservice_kakaotalk_container_image_force_pull }}"
+    pull: always
   when: not matrix_appservice_kakaotalk_container_image_self_build
   register: matrix_appservice_kakaotalk_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -19,11 +17,9 @@
   until: matrix_appservice_kakaotalk_container_image_pull_result is not failed
 
 - name: Ensure matrix-appservice-kakaotalk-node image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_appservice_kakaotalk_node_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_appservice_kakaotalk_node_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_appservice_kakaotalk_node_container_image_force_pull }}"
+    pull: always
   when: not matrix_appservice_kakaotalk_container_image_self_build
   register: matrix_appservice_kakaotalk_node_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -56,28 +52,24 @@
   when: "matrix_appservice_kakaotalk_container_image_self_build | bool"
 
 - name: Ensure matrix-appservice-kakaotalk-node Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_appservice_kakaotalk_node_container_image }}"
-    source: build
-    force_source: "{{ matrix_appservice_kakaotalk_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_appservice_kakaotalk_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}/node"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}/node"
+    pull: true
+    rebuild: "{{ 'always' if matrix_appservice_kakaotalk_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_appservice_kakaotalk_container_image_self_build | bool"
+  register: matrix_appservice_kakaotalk_node_container_image_build_result
 
 - name: Ensure matrix-appservice-kakaotalk Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_appservice_kakaotalk_container_image }}"
-    source: build
-    force_source: "{{ matrix_appservice_kakaotalk_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_appservice_kakaotalk_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_appservice_kakaotalk_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_appservice_kakaotalk_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_appservice_kakaotalk_container_image_self_build | bool"
+  register: matrix_appservice_kakaotalk_container_image_build_result
 
 - name: Ensure matrix-appservice-kakaotalk-node config.json installed
   ansible.builtin.copy:
@@ -138,4 +130,6 @@
         or matrix_appservice_kakaotalk_systemd_service_result.changed | default(false)
         or matrix_appservice_kakaotalk_container_image_pull_result.changed | default(false)
         or matrix_appservice_kakaotalk_node_container_image_pull_result.changed | default(false)
+        or matrix_appservice_kakaotalk_container_image_build_result.changed | default(false)
+        or matrix_appservice_kakaotalk_node_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bridge-appservice-kakaotalk/tasks/validate_config.yml

@@ -25,6 +25,8 @@
     - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix'}
     - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix_upstream', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_appservice_kakaotalk_node_docker_image_registry_prefix_upstream_default', 'new': 'matrix_appservice_kakaotalk_node_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_appservice_kakaotalk_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
+    - {'old': 'matrix_appservice_kakaotalk_node_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required appservice-kakaotalk settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-beeper-linkedin/defaults/main.yml

@@ -20,7 +20,6 @@ matrix_beeper_linkedin_version: latest
 
 # See: https://github.com/beeper/linkedin/pkgs/container/linkedin
 matrix_beeper_linkedin_container_image: "{{ matrix_beeper_linkedin_container_image_registry_prefix }}beeper/linkedin:{{ matrix_beeper_linkedin_container_image_tag }}"
-matrix_beeper_linkedin_container_image_force_pull: "{{ matrix_beeper_linkedin_container_image_tag.startswith('latest') }}"
 matrix_beeper_linkedin_container_image_registry_prefix: "{{ 'localhost/' if matrix_beeper_linkedin_container_image_self_build else matrix_beeper_linkedin_container_image_registry_prefix_upstream }}"
 matrix_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_beeper_linkedin_container_image_registry_prefix_upstream_default }}"
 matrix_beeper_linkedin_container_image_registry_prefix_upstream_default: "ghcr.io/"

roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml

@@ -44,11 +44,9 @@
   register: matrix_beeper_linkedin_registration_result
 
 - name: Ensure Beeper LinkedIn container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_beeper_linkedin_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_beeper_linkedin_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_beeper_linkedin_container_image_force_pull }}"
+    pull: always
   when: "not matrix_beeper_linkedin_container_image_self_build | bool"
   register: matrix_beeper_linkedin_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -83,17 +81,15 @@
       changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0
 
     - name: Ensure Beeper LinkedIn container image is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_beeper_linkedin_container_image }}"
-        source: build
-        force_source: "{{ matrix_beeper_linkedin_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_beeper_linkedin_git_pull_results.changed }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_beeper_linkedin_container_src_files_path }}"
-          pull: true
-          args:
-            TARGETARCH: "{{ matrix_architecture }}"
+        dockerfile: Dockerfile
+        path: "{{ matrix_beeper_linkedin_container_src_files_path }}"
+        pull: true
+        rebuild: "{{ 'always' if matrix_beeper_linkedin_git_pull_results.changed | bool else 'never' }}"
+        args:
+          TARGETARCH: "{{ matrix_architecture }}"
+      register: matrix_beeper_linkedin_container_image_build_result
 
 - name: Ensure beeper-linkedin container network is created
   community.general.docker_network:
@@ -117,4 +113,5 @@
         or matrix_beeper_linkedin_registration_result.changed | default(false)
         or matrix_beeper_linkedin_systemd_service_result.changed | default(false)
         or matrix_beeper_linkedin_container_image_pull_result.changed | default(false)
+        or matrix_beeper_linkedin_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml

@@ -23,6 +23,7 @@
     - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_beeper_linkedin_docker_image_tag', 'new': 'matrix_beeper_linkedin_container_image_tag'}
     - {'old': 'matrix_beeper_linkedin_docker_src_files_path', 'new': 'matrix_beeper_linkedin_container_src_files_path'}
+    - {'old': 'matrix_beeper_linkedin_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required beeper-linkedin settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-heisenbridge/defaults/main.yml

@@ -24,7 +24,6 @@ matrix_heisenbridge_container_image: "{{ matrix_heisenbridge_container_image_reg
 matrix_heisenbridge_container_image_registry_prefix: "{{ matrix_heisenbridge_container_image_registry_prefix_upstream }}"
 matrix_heisenbridge_container_image_registry_prefix_upstream: "{{ matrix_heisenbridge_container_image_registry_prefix_upstream_default }}"
 matrix_heisenbridge_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_heisenbridge_container_image_force_pull: "{{ matrix_heisenbridge_container_image.endswith(':latest') }}"
 
 # Set this to your Matrix ID if you want to enforce the owner, otherwise first _local_ user becomes one
 matrix_heisenbridge_owner: ""

roles/custom/matrix-bridge-heisenbridge/tasks/setup_install.yml

@@ -11,11 +11,9 @@
 ---
 
 - name: Ensure Heisenbridge image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_heisenbridge_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_heisenbridge_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_heisenbridge_container_image_force_pull }}"
+    pull: always
   register: matrix_heisenbridge_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"

roles/custom/matrix-bridge-heisenbridge/tasks/validate_config.yml

@@ -17,6 +17,7 @@
     - {'old': 'matrix_heisenbridge_docker_image_registry_prefix', 'new': 'matrix_heisenbridge_container_image_registry_prefix'}
     - {'old': 'matrix_heisenbridge_docker_image_registry_prefix_upstream', 'new': 'matrix_heisenbridge_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_heisenbridge_docker_image_registry_prefix_upstream_default', 'new': 'matrix_heisenbridge_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_heisenbridge_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 
 - name: Fail if required Heisenbridge settings not defined

roles/custom/matrix-bridge-hookshot/defaults/main.yml

@@ -35,7 +35,6 @@ matrix_hookshot_container_image: "{{ matrix_hookshot_container_image_registry_pr
 matrix_hookshot_container_image_registry_prefix: "{{ 'localhost/' if matrix_hookshot_container_image_self_build else matrix_hookshot_container_image_registry_prefix_upstream }}"
 matrix_hookshot_container_image_registry_prefix_upstream: "{{ matrix_hookshot_container_image_registry_prefix_upstream_default }}"
 matrix_hookshot_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_hookshot_container_image_force_pull: "{{ matrix_hookshot_container_image.endswith(':latest') }}"
 
 matrix_hookshot_base_path: "{{ matrix_base_data_path }}/hookshot"
 

roles/custom/matrix-bridge-hookshot/tasks/setup_install.yml

@@ -29,11 +29,9 @@
   when: item.when | bool
 
 - name: Ensure hookshot image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_hookshot_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_hookshot_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_hookshot_container_image_force_pull }}"
+    pull: always
   when: not matrix_hookshot_container_image_self_build
   register: matrix_hookshot_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -52,16 +50,14 @@
   when: "matrix_hookshot_container_image_self_build | bool"
 
 - name: Ensure hookshot Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_hookshot_container_image }}"
-    source: build
-    force_source: "{{ matrix_hookshot_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_hookshot_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_hookshot_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_hookshot_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_hookshot_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_hookshot_container_image_self_build | bool"
+  register: matrix_hookshot_container_image_build_result
 
 - name: Check if hookshot passkey exists
   ansible.builtin.stat:
@@ -172,4 +168,5 @@
         or matrix_hookshot_support_files_result.changed | default(false)
         or matrix_hookshot_systemd_service_result.changed | default(false)
         or matrix_hookshot_container_image_pull_result.changed | default(false)
+        or matrix_hookshot_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bridge-hookshot/tasks/validate_config.yml

@@ -52,6 +52,7 @@
     - {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_hookshot_docker_image_registry_prefix_upstream_default', 'new': 'matrix_hookshot_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_hookshot_docker_src_files_path', 'new': 'matrix_hookshot_container_src_files_path'}
+    - {'old': 'matrix_hookshot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required Hookshot settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-bluesky/defaults/main.yml

@@ -20,7 +20,6 @@ matrix_mautrix_bluesky_container_image: "{{ matrix_mautrix_bluesky_container_ima
 matrix_mautrix_bluesky_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_bluesky_container_image_self_build else matrix_mautrix_bluesky_container_image_registry_prefix_upstream }}"
 matrix_mautrix_bluesky_container_image_registry_prefix_upstream: "{{ matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_bluesky_container_image_force_pull: "{{ matrix_mautrix_bluesky_container_image.endswith(':latest') }}"
 
 matrix_mautrix_bluesky_base_path: "{{ matrix_base_data_path }}/mautrix-bluesky"
 matrix_mautrix_bluesky_config_path: "{{ matrix_mautrix_bluesky_base_path }}/config"

roles/custom/matrix-bridge-mautrix-bluesky/tasks/setup_install.yml

@@ -8,11 +8,9 @@
     matrix_mautrix_bluesky_migration_requires_restart: false
 
 - name: Ensure Mautrix Bluesky image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_bluesky_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_bluesky_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_bluesky_container_image_force_pull }}"
+    pull: always
   when: matrix_mautrix_bluesky_enabled | bool and not matrix_mautrix_bluesky_container_image_self_build
   register: matrix_mautrix_bluesky_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -45,15 +43,14 @@
   when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build"
 
 - name: Ensure Mautrix Bluesky Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_bluesky_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_bluesky_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_bluesky_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_bluesky_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_bluesky_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_bluesky_enabled | bool and matrix_mautrix_bluesky_container_image_self_build | bool"
+  register: matrix_mautrix_bluesky_container_image_build_result
 
 - name: Ensure mautrix-bluesky config.yaml installed
   ansible.builtin.copy:
@@ -108,6 +105,7 @@
         or matrix_mautrix_bluesky_support_files_result.changed | default(false)
         or matrix_mautrix_bluesky_systemd_service_result.changed | default(false)
         or matrix_mautrix_bluesky_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_bluesky_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-bluesky.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-bluesky/tasks/validate_config.yml

@@ -20,6 +20,7 @@
     - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_bluesky_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_bluesky_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_bluesky_docker_src_files_path', 'new': 'matrix_mautrix_bluesky_container_src_files_path'}
+    - {'old': 'matrix_mautrix_bluesky_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-bluesky settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

@@ -28,7 +28,6 @@ matrix_mautrix_discord_container_image: "{{ matrix_mautrix_discord_container_ima
 matrix_mautrix_discord_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_discord_container_image_self_build else matrix_mautrix_discord_container_image_registry_prefix_upstream }}"
 matrix_mautrix_discord_container_image_registry_prefix_upstream: "{{ matrix_mautrix_discord_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_discord_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_discord_container_image_force_pull: "{{ matrix_mautrix_discord_container_image.endswith(':latest') }}"
 
 matrix_mautrix_discord_base_path: "{{ matrix_base_data_path }}/mautrix-discord"
 matrix_mautrix_discord_config_path: "{{ matrix_mautrix_discord_base_path }}/config"

roles/custom/matrix-bridge-mautrix-discord/tasks/setup_install.yml

@@ -50,11 +50,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Discord image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_discord_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_discord_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_discord_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_discord_container_image_self_build
   register: matrix_mautrix_discord_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -73,16 +71,14 @@
   when: "matrix_mautrix_discord_container_image_self_build | bool"
 
 - name: Ensure Mautrix discord Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_discord_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_discord_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_discord_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_discord_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_discord_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_discord_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_discord_container_image_self_build | bool"
+  register: matrix_mautrix_discord_container_image_build_result
 
 - name: Ensure mautrix-discord config.yaml installed
   ansible.builtin.copy:
@@ -137,6 +133,7 @@
         or matrix_mautrix_discord_support_files_result.changed | default(false)
         or matrix_mautrix_discord_systemd_service_result.changed | default(false)
         or matrix_mautrix_discord_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_discord_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-discord.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-discord/tasks/validate_config.yml

@@ -23,6 +23,7 @@
     - {'old': 'matrix_mautrix_discord_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_discord_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_discord_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_discord_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_discord_docker_src_files_path', 'new': 'matrix_mautrix_discord_container_src_files_path'}
+    - {'old': 'matrix_mautrix_discord_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-discord settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-gmessages/defaults/main.yml

@@ -25,7 +25,6 @@ matrix_mautrix_gmessages_container_image: "{{ matrix_mautrix_gmessages_container
 matrix_mautrix_gmessages_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_gmessages_container_image_self_build else matrix_mautrix_gmessages_container_image_registry_prefix_upstream }}"
 matrix_mautrix_gmessages_container_image_registry_prefix_upstream: "{{ matrix_mautrix_gmessages_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_gmessages_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_gmessages_container_image_force_pull: "{{ matrix_mautrix_gmessages_container_image.endswith(':latest') }}"
 
 matrix_mautrix_gmessages_base_path: "{{ matrix_base_data_path }}/mautrix-gmessages"
 matrix_mautrix_gmessages_config_path: "{{ matrix_mautrix_gmessages_base_path }}/config"

roles/custom/matrix-bridge-mautrix-gmessages/tasks/setup_install.yml

@@ -50,11 +50,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix gmessages image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_gmessages_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_gmessages_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_gmessages_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_gmessages_container_image_self_build
   register: matrix_mautrix_gmessages_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -73,16 +71,14 @@
   when: "matrix_mautrix_gmessages_container_image_self_build | bool"
 
 - name: Ensure Mautrix gmessages Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_gmessages_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_gmessages_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_gmessages_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_gmessages_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_gmessages_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_gmessages_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_gmessages_container_image_self_build | bool"
+  register: matrix_mautrix_gmessages_container_image_build_result
 
 - name: Check if an old database file exists
   ansible.builtin.stat:
@@ -170,6 +166,7 @@
         or matrix_mautrix_gmessages_support_files_result.changed | default(false)
         or matrix_mautrix_gmessages_systemd_service_result.changed | default(false)
         or matrix_mautrix_gmessages_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_gmessages_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-gmessages.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-gmessages/tasks/validate_config.yml

@@ -24,6 +24,7 @@
     - {'old': 'matrix_mautrix_gmessages_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_gmessages_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_gmessages_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_gmessages_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_gmessages_docker_src_files_path', 'new': 'matrix_mautrix_gmessages_container_src_files_path'}
+    - {'old': 'matrix_mautrix_gmessages_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-gmessages settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-googlechat/defaults/main.yml

@@ -26,7 +26,6 @@ matrix_mautrix_googlechat_container_image: "{{ matrix_mautrix_googlechat_contain
 matrix_mautrix_googlechat_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_googlechat_container_image_self_build else matrix_mautrix_googlechat_container_image_registry_prefix_upstream }}"
 matrix_mautrix_googlechat_container_image_registry_prefix_upstream: "{{ matrix_mautrix_googlechat_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_googlechat_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_googlechat_container_image_force_pull: "{{ matrix_mautrix_googlechat_container_image.endswith(':latest') }}"
 
 matrix_mautrix_googlechat_base_path: "{{ matrix_base_data_path }}/mautrix-googlechat"
 matrix_mautrix_googlechat_config_path: "{{ matrix_mautrix_googlechat_base_path }}/config"

roles/custom/matrix-bridge-mautrix-googlechat/tasks/setup_install.yml

@@ -38,11 +38,9 @@
             matrix_mautrix_googlechat_migration_requires_restart: true
 
 - name: Ensure Mautrix googlechat image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_googlechat_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_googlechat_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_googlechat_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_googlechat_container_image_self_build
   register: matrix_mautrix_googlechat_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -75,16 +73,14 @@
   when: "matrix_mautrix_googlechat_container_image_self_build | bool"
 
 - name: Ensure Mautrix googlechat Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_googlechat_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_googlechat_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_googlechat_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_googlechat_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_googlechat_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_googlechat_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_googlechat_container_image_self_build | bool"
+  register: matrix_mautrix_googlechat_container_image_build_result
 
 - name: Check if an old database file already exists
   ansible.builtin.stat:
@@ -160,6 +156,7 @@
         or matrix_mautrix_googlechat_support_files_result.changed | default(false)
         or matrix_mautrix_googlechat_systemd_service_result.changed | default(false)
         or matrix_mautrix_googlechat_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_googlechat_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-googlechat.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-googlechat/tasks/validate_config.yml

@@ -21,6 +21,7 @@
     - {'old': 'matrix_mautrix_googlechat_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_googlechat_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_googlechat_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_googlechat_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_googlechat_docker_src_files_path', 'new': 'matrix_mautrix_googlechat_container_src_files_path'}
+    - {'old': 'matrix_mautrix_googlechat_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-googlechat settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml

@@ -36,7 +36,6 @@ matrix_mautrix_meta_instagram_container_image_registry_prefix_upstream: "{{ matr
 matrix_mautrix_meta_instagram_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_instagram_container_image_tag: "{{ matrix_mautrix_meta_instagram_version }}{{ ('-' ~ matrix_architecture) if (matrix_mautrix_meta_instagram_version | length == 40) else '' }}"
-matrix_mautrix_meta_instagram_container_image_force_pull: "{{ matrix_mautrix_meta_instagram_container_image.endswith(':latest') }}"
 
 matrix_mautrix_meta_instagram_container_network: ""
 

roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml

@@ -33,11 +33,9 @@
             matrix_mautrix_meta_instagram_migration_requires_restart: true
 
 - name: Ensure mautrix-meta-instagram container image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_meta_instagram_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_meta_instagram_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_instagram_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_meta_instagram_container_image_self_build
   register: matrix_mautrix_meta_instagram_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -71,15 +69,13 @@
       register: matrix_mautrix_meta_instagram_git_pull_results
 
     - name: Ensure mautrix-meta-instagram container image is built
-      community.docker.docker_image:
+      community.docker.docker_image_build:
         name: "{{ matrix_mautrix_meta_instagram_container_image }}"
-        source: build
-        force_source: "{{ matrix_mautrix_meta_instagram_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_instagram_git_pull_results.changed }}"
-        build:
-          dockerfile: Dockerfile
-          path: "{{ matrix_mautrix_meta_instagram_container_src_files_path }}"
-          pull: true
+        dockerfile: Dockerfile
+        path: "{{ matrix_mautrix_meta_instagram_container_src_files_path }}"
+        pull: true
+        rebuild: "{{ 'always' if matrix_mautrix_meta_instagram_git_pull_results.changed | bool else 'never' }}"
+      register: matrix_mautrix_meta_instagram_container_image_build_result
 
 - name: Ensure mautrix-meta-instagram config.yaml installed
   ansible.builtin.copy:
@@ -134,6 +130,7 @@
         or matrix_mautrix_meta_instagram_support_files_result.changed | default(false)
         or matrix_mautrix_meta_instagram_systemd_service_result.changed | default(false)
         or matrix_mautrix_meta_instagram_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_meta_instagram_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure mautrix-meta-instagram.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/validate_config.yml

@@ -31,3 +31,4 @@
     - {'old': 'matrix_mautrix_meta_instagram_bridge_login_shared_secret_map_custom', 'new': '<superseded by matrix_mautrix_meta_instagram_double_puppet_secrets_custom>'}
     - {'old': 'matrix_mautrix_meta_instagram_bridge_management_room_text_welcome', 'new': '<removed>'}
     - {'old': 'matrix_mautrix_meta_instagram_container_image_name_prefix', 'new': 'matrix_mautrix_meta_instagram_container_image_registry_prefix'}
+    - {'old': 'matrix_mautrix_meta_instagram_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml

@@ -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

@@ -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

@@ -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)'}

roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml

@@ -33,7 +33,6 @@ matrix_mautrix_signal_container_image_tag: "{{ matrix_mautrix_signal_version }}"
 matrix_mautrix_signal_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_signal_container_image_self_build else matrix_mautrix_signal_container_image_registry_prefix_upstream }}"
 matrix_mautrix_signal_container_image_registry_prefix_upstream: "{{ matrix_mautrix_signal_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_signal_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_signal_container_image_force_pull: "{{ matrix_mautrix_signal_container_image.endswith(':latest') }}"
 
 matrix_mautrix_signal_base_path: "{{ matrix_base_data_path }}/mautrix-signal"
 matrix_mautrix_signal_config_path: "{{ matrix_mautrix_signal_base_path }}/config"

roles/custom/matrix-bridge-mautrix-signal/tasks/setup_install.yml

@@ -55,11 +55,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix signal image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_signal_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_signal_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_signal_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_signal_container_image_self_build
   register: matrix_mautrix_signal_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -78,16 +76,14 @@
   when: "matrix_mautrix_signal_container_image_self_build | bool"
 
 - name: Ensure Mautrix signal Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_signal_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_signal_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_signal_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_signal_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_signal_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_signal_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_signal_container_image_self_build | bool"
+  register: matrix_mautrix_signal_container_image_build_result
 
 - name: Check if an old database file exists
   ansible.builtin.stat:
@@ -175,6 +171,7 @@
         or matrix_mautrix_signal_support_files_result.changed | default(false)
         or matrix_mautrix_signal_systemd_service_result.changed | default(false)
         or matrix_mautrix_signal_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_signal_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-signal.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-signal/tasks/validate_config.yml

@@ -29,6 +29,7 @@
     - {'old': 'matrix_mautrix_signal_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_signal_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_signal_docker_image_tag', 'new': 'matrix_mautrix_signal_container_image_tag'}
     - {'old': 'matrix_mautrix_signal_docker_src_files_path', 'new': 'matrix_mautrix_signal_container_src_files_path'}
+    - {'old': 'matrix_mautrix_signal_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-signal settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-slack/defaults/main.yml

@@ -23,7 +23,6 @@ matrix_mautrix_slack_container_image: "{{ matrix_mautrix_slack_container_image_r
 matrix_mautrix_slack_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_slack_container_image_self_build else matrix_mautrix_slack_container_image_registry_prefix_upstream }}"
 matrix_mautrix_slack_container_image_registry_prefix_upstream: "{{ matrix_mautrix_slack_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_slack_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_slack_container_image_force_pull: "{{ matrix_mautrix_slack_container_image.endswith(':latest') }}"
 
 matrix_mautrix_slack_base_path: "{{ matrix_base_data_path }}/mautrix-slack"
 matrix_mautrix_slack_config_path: "{{ matrix_mautrix_slack_base_path }}/config"

roles/custom/matrix-bridge-mautrix-slack/tasks/setup_install.yml

@@ -49,11 +49,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Slack image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_slack_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_slack_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_slack_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_slack_container_image_self_build
   register: matrix_mautrix_slack_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -72,16 +70,14 @@
   when: "matrix_mautrix_slack_container_image_self_build | bool"
 
 - name: Ensure Mautrix slack Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_slack_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_slack_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_slack_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_slack_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_slack_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_slack_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_slack_container_image_self_build | bool"
+  register: matrix_mautrix_slack_container_image_build_result
 
 - name: Ensure mautrix-slack config.yaml installed
   ansible.builtin.copy:
@@ -124,6 +120,7 @@
         or matrix_mautrix_slack_registration_result.changed | default(false)
         or matrix_mautrix_slack_systemd_service_result.changed | default(false)
         or matrix_mautrix_slack_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_slack_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-slack.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-slack/tasks/validate_config.yml

@@ -23,6 +23,7 @@
     - {'old': 'matrix_mautrix_slack_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_slack_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_slack_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_slack_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_slack_docker_src_files_path', 'new': 'matrix_mautrix_slack_container_src_files_path'}
+    - {'old': 'matrix_mautrix_slack_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-slack settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-telegram/defaults/main.yml

@@ -33,7 +33,6 @@ matrix_mautrix_telegram_container_image: "{{ matrix_mautrix_telegram_container_i
 matrix_mautrix_telegram_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_telegram_container_image_self_build else matrix_mautrix_telegram_container_image_registry_prefix_upstream }}"
 matrix_mautrix_telegram_container_image_registry_prefix_upstream: "{{ matrix_mautrix_telegram_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_telegram_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_telegram_container_image_force_pull: "{{ matrix_mautrix_telegram_container_image.endswith(':latest') }}"
 
 matrix_mautrix_telegram_base_path: "{{ matrix_base_data_path }}/mautrix-telegram"
 matrix_mautrix_telegram_config_path: "{{ matrix_mautrix_telegram_base_path }}/config"

roles/custom/matrix-bridge-mautrix-telegram/tasks/setup_install.yml

@@ -94,11 +94,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Telegram image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_telegram_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_telegram_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_telegram_container_image_force_pull }}"
+    pull: always
   when: "not matrix_mautrix_telegram_container_image_self_build | bool"
   register: matrix_mautrix_telegram_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -117,16 +115,14 @@
   when: "matrix_mautrix_telegram_container_image_self_build | bool"
 
 - name: Ensure Mautrix Telegram Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_telegram_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_telegram_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_telegram_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_telegram_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_telegram_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_telegram_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_telegram_container_image_self_build | bool"
+  register: matrix_mautrix_telegram_container_image_build_result
 
 - name: Ensure mautrix-telegram config.yaml installed
   ansible.builtin.copy:
@@ -181,6 +177,7 @@
         or matrix_mautrix_telegram_support_files_result.changed | default(false)
         or matrix_mautrix_telegram_systemd_service_result.changed | default(false)
         or matrix_mautrix_telegram_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_telegram_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-telegram.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-telegram/tasks/validate_config.yml

@@ -22,6 +22,7 @@
     - {'old': 'matrix_mautrix_telegram_docker_src_files_path', 'new': 'matrix_mautrix_telegram_container_src_files_path'}
     - {'old': 'matrix_mautrix_telegram_docker_image', 'new': 'matrix_mautrix_telegram_container_image'}
     - {'old': 'matrix_mautrix_telegram_docker_image_force_pull', 'new': 'matrix_mautrix_telegram_container_image_force_pull'}
+    - {'old': 'matrix_mautrix_telegram_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
     - {'old': 'matrix_mautrix_telegram_docker_image_registry_prefix', 'new': 'matrix_mautrix_telegram_container_image_registry_prefix'}
     - {'old': 'matrix_mautrix_telegram_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_telegram_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_telegram_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_telegram_container_image_registry_prefix_upstream_default'}

roles/custom/matrix-bridge-mautrix-twitter/defaults/main.yml

@@ -28,7 +28,6 @@ matrix_mautrix_twitter_container_image: "{{ matrix_mautrix_twitter_container_ima
 matrix_mautrix_twitter_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_twitter_container_image_self_build else matrix_mautrix_twitter_container_image_registry_prefix_upstream }}"
 matrix_mautrix_twitter_container_image_registry_prefix_upstream: "{{ matrix_mautrix_twitter_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_twitter_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_twitter_container_image_force_pull: "{{ matrix_mautrix_twitter_container_image.endswith(':latest') }}"
 
 matrix_mautrix_twitter_base_path: "{{ matrix_base_data_path }}/mautrix-twitter"
 matrix_mautrix_twitter_config_path: "{{ matrix_mautrix_twitter_base_path }}/config"

roles/custom/matrix-bridge-mautrix-twitter/tasks/setup_install.yml

@@ -14,11 +14,9 @@
     matrix_mautrix_twitter_migration_requires_restart: false
 
 - name: Ensure Mautrix Twitter image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_twitter_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_twitter_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_twitter_container_image_force_pull }}"
+    pull: always
   when: matrix_mautrix_twitter_enabled | bool and not matrix_mautrix_twitter_container_image_self_build
   register: matrix_mautrix_twitter_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,15 +49,14 @@
   when: "matrix_mautrix_twitter_enabled | bool and matrix_mautrix_twitter_container_image_self_build"
 
 - name: Ensure Mautrix Twitter Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_twitter_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_twitter_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_twitter_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_twitter_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_twitter_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_twitter_enabled | bool and matrix_mautrix_twitter_container_image_self_build | bool"
+  register: matrix_mautrix_twitter_container_image_build_result
 
 - name: Ensure mautrix-twitter config.yaml installed
   ansible.builtin.copy:
@@ -114,6 +111,7 @@
         or matrix_mautrix_twitter_support_files_result.changed | default(false)
         or matrix_mautrix_twitter_systemd_service_result.changed | default(false)
         or matrix_mautrix_twitter_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_twitter_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-twitter.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-twitter/tasks/validate_config.yml

@@ -28,6 +28,7 @@
     - {'old': 'matrix_mautrix_twitter_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_twitter_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_twitter_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_twitter_docker_src_files_path', 'new': 'matrix_mautrix_twitter_container_src_files_path'}
+    - {'old': 'matrix_mautrix_twitter_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-twitter settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-whatsapp/defaults/main.yml

@@ -35,7 +35,6 @@ matrix_mautrix_whatsapp_container_image: "{{ matrix_mautrix_whatsapp_container_i
 matrix_mautrix_whatsapp_container_image_registry_prefix: "{{ 'localhost/' if matrix_mautrix_whatsapp_container_image_self_build else matrix_mautrix_whatsapp_container_image_registry_prefix_upstream }}"
 matrix_mautrix_whatsapp_container_image_registry_prefix_upstream: "{{ matrix_mautrix_whatsapp_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_whatsapp_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_whatsapp_container_image_force_pull: "{{ matrix_mautrix_whatsapp_container_image.endswith(':latest') }}"
 
 matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"
 matrix_mautrix_whatsapp_config_path: "{{ matrix_mautrix_whatsapp_base_path }}/config"

roles/custom/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml

@@ -60,11 +60,9 @@
   when: item.when | bool
 
 - name: Ensure Mautrix Whatsapp image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_whatsapp_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_whatsapp_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_whatsapp_container_image_force_pull }}"
+    pull: always
   when: not matrix_mautrix_whatsapp_container_image_self_build
   register: matrix_mautrix_whatsapp_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -83,16 +81,14 @@
   when: "matrix_mautrix_whatsapp_container_image_self_build | bool"
 
 - name: Ensure Mautrix Whatsapp Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mautrix_whatsapp_container_image }}"
-    source: build
-    force_source: "{{ matrix_mautrix_whatsapp_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_whatsapp_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mautrix_whatsapp_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mautrix_whatsapp_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mautrix_whatsapp_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mautrix_whatsapp_container_image_self_build | bool"
+  register: matrix_mautrix_whatsapp_container_image_build_result
 
 - name: Check if an old database file exists
   ansible.builtin.stat:
@@ -180,6 +176,7 @@
         or matrix_mautrix_whatsapp_support_files_result.changed | default(false)
         or matrix_mautrix_whatsapp_systemd_service_result.changed | default(false)
         or matrix_mautrix_whatsapp_container_image_pull_result.changed | default(false)
+        or matrix_mautrix_whatsapp_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mautrix-whatsapp.service restarted, if necessary

roles/custom/matrix-bridge-mautrix-whatsapp/tasks/validate_config.yml

@@ -28,6 +28,7 @@
     - {'old': 'matrix_mautrix_whatsapp_docker_image_registry_prefix_upstream', 'new': 'matrix_mautrix_whatsapp_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mautrix_whatsapp_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_whatsapp_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_whatsapp_docker_src_files_path', 'new': 'matrix_mautrix_whatsapp_container_src_files_path'}
+    - {'old': 'matrix_mautrix_whatsapp_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mautrix-whatsapp settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-mautrix-wsproxy/defaults/main.yml

@@ -17,7 +17,6 @@ matrix_mautrix_wsproxy_container_image: "{{ matrix_mautrix_wsproxy_container_ima
 matrix_mautrix_wsproxy_container_image_registry_prefix: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream }}"
 matrix_mautrix_wsproxy_container_image_registry_prefix_upstream: "{{ matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default }}"
 matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default: "dock.mau.dev/"
-matrix_mautrix_wsproxy_container_image_force_pull: "{{ matrix_mautrix_wsproxy_container_image.endswith(':latest') }}"
 
 matrix_mautrix_wsproxy_base_path: "{{ matrix_base_data_path }}/wsproxy"
 matrix_mautrix_wsproxy_config_path: "{{ matrix_mautrix_wsproxy_base_path }}/config"
@@ -148,7 +147,6 @@ matrix_mautrix_imessage_registration: "{{ matrix_mautrix_imessage_registration_y
 matrix_mautrix_wsproxy_syncproxy_version: latest
 # See: https://mau.dev/mautrix/wsproxy/container_registry
 matrix_mautrix_wsproxy_syncproxy_container_image: "dock.mau.dev/mautrix/syncproxy:{{ matrix_mautrix_wsproxy_syncproxy_version }}"
-matrix_mautrix_wsproxy_syncproxy_container_image_force_pull: "{{ matrix_mautrix_wsproxy_syncproxy_container_image.endswith(':latest') }}"
 matrix_mautrix_wsproxy_syncproxy_container_extra_arguments: []
 
 matrix_mautrix_wsproxy_syncproxy_systemd_required_services_list: |-

roles/custom/matrix-bridge-mautrix-wsproxy/tasks/setup_install.yml

@@ -46,20 +46,22 @@
   register: matrix_mautrix_wsproxy_support_files_result
 
 - name: Ensure Mautrix wsproxy image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_wsproxy_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_wsproxy_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_wsproxy_container_image_force_pull }}"
+    pull: always
   register: matrix_mautrix_wsproxy_container_image_pull_result
+  retries: "{{ devture_playbook_help_container_retries_count }}"
+  delay: "{{ devture_playbook_help_container_retries_delay }}"
+  until: matrix_mautrix_wsproxy_container_image_pull_result is not failed
 
 - name: Ensure Mautrix syncproxy image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mautrix_wsproxy_syncproxy_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mautrix_wsproxy_syncproxy_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_wsproxy_syncproxy_container_image_force_pull }}"
+    pull: always
   register: matrix_mautrix_wsproxy_syncproxy_container_image_pull_result
+  retries: "{{ devture_playbook_help_container_retries_count }}"
+  delay: "{{ devture_playbook_help_container_retries_delay }}"
+  until: matrix_mautrix_wsproxy_syncproxy_container_image_pull_result is not failed
 
 - name: Ensure Mautrix wsproxy paths exists
   ansible.builtin.file:

roles/custom/matrix-bridge-mautrix-wsproxy/tasks/validate_config.yml

@@ -19,6 +19,8 @@
     - {'old': 'matrix_mautrix_wsproxy_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mautrix_wsproxy_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image'}
     - {'old': 'matrix_mautrix_wsproxy_syncproxy_docker_image_force_pull', 'new': 'matrix_mautrix_wsproxy_syncproxy_container_image_force_pull'}
+    - {'old': 'matrix_mautrix_wsproxy_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
+    - {'old': 'matrix_mautrix_wsproxy_syncproxy_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 
 - name: Fail if required settings not defined

roles/custom/matrix-bridge-meshtastic-relay/defaults/main.yml

@@ -15,7 +15,6 @@ matrix_meshtastic_relay_container_image: "{{ matrix_meshtastic_relay_container_i
 matrix_meshtastic_relay_container_image_registry_prefix: "{{ matrix_meshtastic_relay_container_image_registry_prefix_upstream }}"
 matrix_meshtastic_relay_container_image_registry_prefix_upstream: "{{ matrix_meshtastic_relay_container_image_registry_prefix_upstream_default }}"
 matrix_meshtastic_relay_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_meshtastic_relay_container_image_force_pull: "{{ matrix_meshtastic_relay_container_image.endswith(':latest') }}"
 
 matrix_meshtastic_relay_base_path: "{{ matrix_base_data_path }}/meshtastic-relay"
 

roles/custom/matrix-bridge-meshtastic-relay/tasks/setup_install.yml

@@ -6,11 +6,9 @@
 ---
 
 - name: Ensure matrix-meshtastic-relay image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_meshtastic_relay_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_meshtastic_relay_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_meshtastic_relay_container_image_force_pull }}"
+    pull: always
   register: matrix_meshtastic_relay_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"

roles/custom/matrix-bridge-meshtastic-relay/tasks/validate_config.yml

@@ -21,3 +21,11 @@
       `matrix_meshtastic_relay_connection_type` must be one of: `tcp`, `serial`, `ble`.
       Got: `{{ matrix_meshtastic_relay_connection_type }}`.
   when: "matrix_meshtastic_relay_connection_type not in ['tcp', 'serial', 'ble']"
+
+- name: (Deprecation) Catch and report renamed matrix-meshtastic-relay variables
+  ansible.builtin.fail:
+    msg: >-
+      The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
+  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
+  with_items:
+    - {'old': 'matrix_meshtastic_relay_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

roles/custom/matrix-bridge-mx-puppet-groupme/defaults/main.yml

@@ -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_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_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_config_path: "{{ matrix_mx_puppet_groupme_base_path }}/config"

roles/custom/matrix-bridge-mx-puppet-groupme/tasks/setup_install.yml

@@ -73,11 +73,9 @@
             matrix_mx_puppet_groupme_migration_requires_restart: true
 
 - name: Ensure MX Puppet Groupme image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mx_puppet_groupme_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    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 }}"
+    pull: always
   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
   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"
 
 - 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 }}"
-    source: build
-    force_source: "{{ matrix_mx_puppet_groupme_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_mx_puppet_groupme_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mx_puppet_groupme_git_pull_results.changed | bool else 'never' }}"
   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
   ansible.builtin.copy:
@@ -148,6 +144,7 @@
         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_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

roles/custom/matrix-bridge-mx-puppet-groupme/tasks/validate_config.yml

@@ -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_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_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
   ansible.builtin.fail:

roles/custom/matrix-bridge-mx-puppet-steam/defaults/main.yml

@@ -30,7 +30,6 @@ matrix_mx_puppet_steam_container_image: "{{ matrix_mx_puppet_steam_container_ima
 matrix_mx_puppet_steam_container_image_registry_prefix: "{{ 'localhost/' if matrix_mx_puppet_steam_container_image_self_build else matrix_mx_puppet_steam_container_image_registry_prefix_upstream }}"
 matrix_mx_puppet_steam_container_image_registry_prefix_upstream: "{{ matrix_mx_puppet_steam_container_image_registry_prefix_upstream_default }}"
 matrix_mx_puppet_steam_container_image_registry_prefix_upstream_default: "docker.io/"
-matrix_mx_puppet_steam_container_image_force_pull: "{{ matrix_mx_puppet_steam_container_image.endswith(':latest') }}"
 
 matrix_mx_puppet_steam_base_path: "{{ matrix_base_data_path }}/mx-puppet-steam"
 matrix_mx_puppet_steam_config_path: "{{ matrix_mx_puppet_steam_base_path }}/config"

roles/custom/matrix-bridge-mx-puppet-steam/tasks/setup_install.yml

@@ -75,11 +75,9 @@
             matrix_mx_puppet_steam_migration_requires_restart: true
 
 - name: Ensure MX Puppet Steam image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_mx_puppet_steam_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_mx_puppet_steam_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_steam_container_image_force_pull }}"
+    pull: always
   when: matrix_mx_puppet_steam_enabled | bool and not matrix_mx_puppet_steam_container_image_self_build
   register: matrix_mx_puppet_steam_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -98,16 +96,14 @@
   when: "matrix_mx_puppet_steam_enabled | bool and matrix_mx_puppet_steam_container_image_self_build"
 
 - name: Ensure MX Puppet Steam Docker image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_mx_puppet_steam_container_image }}"
-    source: build
-    force_source: "{{ matrix_mx_puppet_steam_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_mx_puppet_steam_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_mx_puppet_steam_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_mx_puppet_steam_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_mx_puppet_steam_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_mx_puppet_steam_enabled | bool and matrix_mx_puppet_steam_container_image_self_build"
+  register: matrix_mx_puppet_steam_container_image_build_result
 
 - name: Ensure mx-puppet-steam config.yaml installed
   ansible.builtin.copy:
@@ -150,6 +146,7 @@
         or matrix_mx_puppet_steam_registration_result.changed | default(false)
         or matrix_mx_puppet_steam_systemd_service_result.changed | default(false)
         or matrix_mx_puppet_steam_container_image_pull_result.changed | default(false)
+        or matrix_mx_puppet_steam_container_image_build_result.changed | default(false)
       }}
 
 - name: Ensure matrix-mx-puppet-steam.service restarted, if necessary

roles/custom/matrix-bridge-mx-puppet-steam/tasks/validate_config.yml

@@ -18,6 +18,7 @@
     - {'old': 'matrix_mx_puppet_steam_docker_image_registry_prefix_upstream', 'new': 'matrix_mx_puppet_steam_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_mx_puppet_steam_docker_image_registry_prefix_upstream_default', 'new': 'matrix_mx_puppet_steam_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_mx_puppet_steam_docker_src_files_path', 'new': 'matrix_mx_puppet_steam_container_src_files_path'}
+    - {'old': 'matrix_mx_puppet_steam_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required mx-puppet-steam settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-postmoogle/defaults/main.yml

@@ -23,7 +23,6 @@ matrix_postmoogle_container_image: "{{ matrix_postmoogle_container_image_registr
 matrix_postmoogle_container_image_registry_prefix: "{{ 'localhost/' if matrix_postmoogle_container_image_self_build else matrix_postmoogle_container_image_registry_prefix_upstream }}"
 matrix_postmoogle_container_image_registry_prefix_upstream: "{{ matrix_postmoogle_container_image_registry_prefix_upstream_default }}"
 matrix_postmoogle_container_image_registry_prefix_upstream_default: "ghcr.io/"
-matrix_postmoogle_container_image_force_pull: "{{ matrix_postmoogle_container_image.endswith(':latest') }}"
 
 matrix_postmoogle_base_path: "{{ matrix_base_data_path }}/postmoogle"
 matrix_postmoogle_config_path: "{{ matrix_postmoogle_base_path }}/config"

roles/custom/matrix-bridge-postmoogle/tasks/setup_install.yml

@@ -79,11 +79,9 @@
   register: matrix_postmoogle_env_result
 
 - name: Ensure postmoogle image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_postmoogle_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_postmoogle_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_postmoogle_container_image_force_pull }}"
+    pull: always
   when: "not matrix_postmoogle_container_image_self_build | bool"
   register: matrix_postmoogle_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -102,16 +100,14 @@
   when: "matrix_postmoogle_container_image_self_build | bool"
 
 - name: Ensure postmoogle image is built
-  community.docker.docker_image:
+  community.docker.docker_image_build:
     name: "{{ matrix_postmoogle_container_image }}"
-    source: build
-    force_source: "{{ matrix_postmoogle_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_postmoogle_git_pull_results.changed }}"
-    build:
-      dockerfile: Dockerfile
-      path: "{{ matrix_postmoogle_container_src_files_path }}"
-      pull: true
+    dockerfile: Dockerfile
+    path: "{{ matrix_postmoogle_container_src_files_path }}"
+    pull: true
+    rebuild: "{{ 'always' if matrix_postmoogle_git_pull_results.changed | bool else 'never' }}"
   when: "matrix_postmoogle_container_image_self_build | bool"
+  register: matrix_postmoogle_container_image_build_result
 
 - name: Ensure postmoogle container network is created
   community.general.docker_network:
@@ -135,4 +131,5 @@
         or matrix_postmoogle_env_result.changed | default(false)
         or matrix_postmoogle_systemd_service_result.changed | default(false)
         or matrix_postmoogle_container_image_pull_result.changed | default(false)
+        or matrix_postmoogle_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bridge-postmoogle/tasks/validate_config.yml

@@ -21,6 +21,7 @@
     - {'old': 'matrix_postmoogle_docker_repo', 'new': 'matrix_postmoogle_container_repo'}
     - {'old': 'matrix_postmoogle_docker_repo_version', 'new': 'matrix_postmoogle_container_repo_version'}
     - {'old': 'matrix_postmoogle_docker_src_files_path', 'new': 'matrix_postmoogle_container_src_files_path'}
+    - {'old': 'matrix_postmoogle_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required Postmoogle settings not defined
   ansible.builtin.fail:

roles/custom/matrix-bridge-sms/tasks/setup_install.yml

@@ -11,9 +11,9 @@
 ---
 
 - name: Ensure matrix-sms-bridge image is pulled
-  community.docker.docker_image:
+  community.docker.docker_image_pull:
     name: "{{ matrix_sms_bridge_container_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
+    pull: always
   register: matrix_sms_bridge_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"

roles/custom/matrix-bridge-sms/tasks/validate_config.yml

@@ -19,6 +19,7 @@
     - {'old': 'matrix_sms_bridge_docker_image_registry_prefix_upstream', 'new': 'matrix_sms_bridge_container_image_registry_prefix_upstream'}
     - {'old': 'matrix_sms_bridge_docker_image_registry_prefix_upstream_default', 'new': 'matrix_sms_bridge_container_image_registry_prefix_upstream_default'}
     - {'old': 'matrix_sms_bridge_docker_image_tag', 'new': 'matrix_sms_bridge_container_image_tag'}
+    - {'old': 'matrix_sms_bridge_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 
 - name: Fail if required matrix-bridge-sms settings not defined

roles/custom/matrix-bridge-steam/defaults/main.yml

@@ -19,7 +19,6 @@ matrix_steam_bridge_container_image_registry_prefix: "{{ 'localhost/' if matrix_
 matrix_steam_bridge_container_image_registry_prefix_upstream: "{{ matrix_steam_bridge_container_image_registry_prefix_upstream_default }}"
 matrix_steam_bridge_container_image_registry_prefix_upstream_default: "ghcr.io/"
 matrix_steam_bridge_container_image_tag: "{{ matrix_steam_bridge_version }}"
-matrix_steam_bridge_container_image_force_pull: "{{ matrix_steam_bridge_container_image.endswith(':latest') }}"
 
 matrix_steam_bridge_base_path: "{{ matrix_base_data_path }}/matrix-steam-bridge"
 matrix_steam_bridge_config_path: "{{ matrix_steam_bridge_base_path }}/config"