Rename _docker_ vars to _container_ across 34 roles

Roles affected: appservice-discord, appservice-irc, beeper-linkedin,
heisenbridge, hookshot, mautrix-bluesky, mautrix-discord,
mautrix-gmessages, mautrix-googlechat, mautrix-signal, mautrix-slack,
mautrix-twitter, mautrix-whatsapp, mautrix-wsproxy, mx-puppet-groupme,
mx-puppet-steam, postmoogle, sms, steam, cactus-comments, element,
fluffychat, schildichat, conduit, corporal, dendrite,
ldap-registration-proxy, media-repo, pantalaimon,
prometheus-nginxlog-exporter, registration, sygnal, synapse-admin,
user-verification-service.

For each role: renamed _docker_image* variables to _container_image*
(and _docker_src_files_path to _container_src_files_path where
applicable), added deprecation entries in validate_config.yml, and
updated group_vars/docs references.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

roles/custom/matrix-client-fluffychat/defaults/main.yml

@@ -14,11 +14,11 @@ matrix_client_fluffychat_container_image_self_build_version: "{{ 'main' if matri
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/fluffychat-web
 matrix_client_fluffychat_version: v2.4.1
-matrix_client_fluffychat_docker_image: "{{ matrix_client_fluffychat_docker_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}"
-matrix_client_fluffychat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_docker_image_registry_prefix_upstream }}"
-matrix_client_fluffychat_docker_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_docker_image_registry_prefix_upstream_default }}"
-matrix_client_fluffychat_docker_image_registry_prefix_upstream_default: ghcr.io/
-matrix_client_fluffychat_docker_image_force_pull: "{{ matrix_client_fluffychat_docker_image.endswith(':latest') }}"
+matrix_client_fluffychat_container_image: "{{ matrix_client_fluffychat_container_image_registry_prefix }}etkecc/fluffychat-web:{{ matrix_client_fluffychat_version }}"
+matrix_client_fluffychat_container_image_registry_prefix: "{{ 'localhost/' if matrix_client_fluffychat_container_image_self_build else matrix_client_fluffychat_container_image_registry_prefix_upstream }}"
+matrix_client_fluffychat_container_image_registry_prefix_upstream: "{{ matrix_client_fluffychat_container_image_registry_prefix_upstream_default }}"
+matrix_client_fluffychat_container_image_registry_prefix_upstream_default: ghcr.io/
+matrix_client_fluffychat_container_image_force_pull: "{{ matrix_client_fluffychat_container_image.endswith(':latest') }}"
 
 matrix_client_fluffychat_base_path: "{{ matrix_base_data_path }}/client-fluffychat"
 matrix_client_fluffychat_config_path: "{{ matrix_client_fluffychat_base_path }}/config"

roles/custom/matrix-client-fluffychat/tasks/setup_install.yml

@@ -19,10 +19,10 @@
 
 - name: Ensure FluffyChat Web container image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_client_fluffychat_docker_image }}"
+    name: "{{ matrix_client_fluffychat_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_client_fluffychat_docker_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_client_fluffychat_docker_image_force_pull }}"
+    force_source: "{{ matrix_client_fluffychat_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_client_fluffychat_container_image_force_pull }}"
   when: "not matrix_client_fluffychat_container_image_self_build | bool"
   register: matrix_client_fluffychat_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -45,7 +45,7 @@
       ansible.builtin.command:
         cmd: |-
           {{ devture_systemd_docker_base_host_command_docker }} buildx build
-          --tag={{ matrix_client_fluffychat_docker_image }}
+          --tag={{ matrix_client_fluffychat_container_image }}
           --file={{ matrix_client_fluffychat_container_src_files_path }}/Dockerfile
           {{ matrix_client_fluffychat_container_src_files_path }}
       changed_when: true

roles/custom/matrix-client-fluffychat/tasks/validate_config.yml

@@ -5,14 +5,6 @@
 
 ---
 
-- name: Fail if required FluffyChat Web settings not defined
-  ansible.builtin.fail:
-    msg: >
-      You need to define a required configuration setting (`{{ item }}`) for using FluffyChat Web.
-  when: "lookup('vars', item, default='') == ''"
-  with_items:
-    - matrix_client_fluffychat_container_network
-
 - name: (Deprecation) Catch and report renamed FluffyChat Web variables
   ansible.builtin.fail:
     msg: >-
@@ -20,6 +12,19 @@
   when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
   with_items:
     - {'old': 'matrix_client_fluffychat_container_image_name_prefix', 'new': 'matrix_client_fluffychat_container_image_registry_prefix'}
+    - {'old': 'matrix_client_fluffychat_docker_image', 'new': 'matrix_client_fluffychat_container_image'}
+    - {'old': 'matrix_client_fluffychat_docker_image_force_pull', 'new': 'matrix_client_fluffychat_container_image_force_pull'}
+    - {'old': 'matrix_client_fluffychat_docker_image_registry_prefix', 'new': 'matrix_client_fluffychat_container_image_registry_prefix'}
+    - {'old': 'matrix_client_fluffychat_docker_image_registry_prefix_upstream', 'new': 'matrix_client_fluffychat_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_client_fluffychat_docker_image_registry_prefix_upstream_default', 'new': 'matrix_client_fluffychat_container_image_registry_prefix_upstream_default'}
+
+- name: Fail if required FluffyChat Web settings not defined
+  ansible.builtin.fail:
+    msg: >
+      You need to define a required configuration setting (`{{ item }}`) for using FluffyChat Web.
+  when: "lookup('vars', item, default='') == ''"
+  with_items:
+    - matrix_client_fluffychat_container_network
 
 - when: matrix_client_fluffychat_container_labels_traefik_enabled | bool
   block:

roles/custom/matrix-client-fluffychat/templates/systemd/matrix-client-fluffychat.service.j2

@@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_client_fluffychat_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_client_fluffychat_docker_image }}
+			{{ matrix_client_fluffychat_container_image }}
 
 {% for network in matrix_client_fluffychat_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-fluffychat