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-corporal/defaults/main.yml

@@ -92,12 +92,12 @@ matrix_corporal_systemd_required_services_list_default: "{{ [devture_systemd_doc
 matrix_corporal_systemd_required_services_list_auto: []
 matrix_corporal_systemd_required_services_list_custom: []
 
-matrix_corporal_docker_image: "{{ matrix_corporal_docker_image_registry_prefix }}devture/matrix-corporal:{{ matrix_corporal_docker_image_tag }}"
-matrix_corporal_docker_image_registry_prefix: "{{ 'localhost/' if matrix_corporal_container_image_self_build else matrix_corporal_docker_image_registry_prefix_upstream }}"
-matrix_corporal_docker_image_registry_prefix_upstream: "{{ matrix_corporal_docker_image_registry_prefix_upstream_default }}"
-matrix_corporal_docker_image_registry_prefix_upstream_default: ghcr.io/
-matrix_corporal_docker_image_tag: "{{ matrix_corporal_version }}"  # for backward-compatibility
-matrix_corporal_docker_image_force_pull: "{{ matrix_corporal_docker_image.endswith(':latest') }}"
+matrix_corporal_container_image: "{{ matrix_corporal_container_image_registry_prefix }}devture/matrix-corporal:{{ matrix_corporal_container_image_tag }}"
+matrix_corporal_container_image_registry_prefix: "{{ 'localhost/' if matrix_corporal_container_image_self_build else matrix_corporal_container_image_registry_prefix_upstream }}"
+matrix_corporal_container_image_registry_prefix_upstream: "{{ matrix_corporal_container_image_registry_prefix_upstream_default }}"
+matrix_corporal_container_image_registry_prefix_upstream_default: ghcr.io/
+matrix_corporal_container_image_tag: "{{ matrix_corporal_version }}"  # for backward-compatibility
+matrix_corporal_container_image_force_pull: "{{ matrix_corporal_container_image.endswith(':latest') }}"
 
 matrix_corporal_base_path: "{{ matrix_base_data_path }}/corporal"
 matrix_corporal_container_src_files_path: "{{ matrix_corporal_base_path }}/container-src"

roles/custom/matrix-corporal/tasks/setup_install.yml

@@ -28,7 +28,7 @@
   ansible.builtin.git:
     repo: "{{ matrix_corporal_container_image_self_build_repo }}"
     dest: "{{ matrix_corporal_container_src_files_path }}"
-    version: "{{ matrix_corporal_docker_image.split(':')[1] }}"
+    version: "{{ matrix_corporal_container_image.split(':')[1] }}"
     force: "yes"
   become: true
   become_user: "{{ matrix_user_name }}"
@@ -37,7 +37,7 @@
 
 - name: Ensure Matrix Corporal Docker image is built
   community.docker.docker_image:
-    name: "{{ matrix_corporal_docker_image }}"
+    name: "{{ matrix_corporal_container_image }}"
     source: build
     force_source: "{{ matrix_corporal_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_corporal_git_pull_results.changed }}"
@@ -49,10 +49,10 @@
 
 - name: Ensure Matrix Corporal Docker image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_corporal_docker_image }}"
+    name: "{{ matrix_corporal_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_corporal_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_corporal_docker_image_force_pull }}"
+    force_source: "{{ matrix_corporal_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_corporal_container_image_force_pull }}"
   when: not matrix_corporal_container_image_self_build | bool
   register: matrix_corporal_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"

roles/custom/matrix-corporal/tasks/validate_config.yml

@@ -6,6 +6,23 @@
 
 ---
 
+- name: (Deprecation) Catch and report renamed corporal variables
+  ansible.builtin.fail:
+    msg: >-
+      Your configuration contains a variable, which now has a different name.
+      Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
+  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
+  with_items:
+    - {'old': 'matrix_corporal_container_expose_ports', 'new': '<superseded by matrix_corporal_container_http_gateway_host_bind_port and matrix_corporal_container_http_api_host_bind_port>'}
+    - {'old': 'matrix_corporal_reconciliation_user_id_local_part', 'new': 'matrix_corporal_corporal_user_id_local_part'}
+    - {'old': 'matrix_corporal_container_image_name_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'}
+    - {'old': 'matrix_corporal_docker_image', 'new': 'matrix_corporal_container_image'}
+    - {'old': 'matrix_corporal_docker_image_force_pull', 'new': 'matrix_corporal_container_image_force_pull'}
+    - {'old': 'matrix_corporal_docker_image_registry_prefix', 'new': 'matrix_corporal_container_image_registry_prefix'}
+    - {'old': 'matrix_corporal_docker_image_registry_prefix_upstream', 'new': 'matrix_corporal_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_corporal_docker_image_registry_prefix_upstream_default', 'new': 'matrix_corporal_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_corporal_docker_image_tag', 'new': 'matrix_corporal_container_image_tag'}
+
 - name: Fail if required matrix-corporal settings not defined
   ansible.builtin.fail:
     msg: >-
@@ -22,14 +39,3 @@
   ansible.builtin.fail:
     msg: "The Matrix Corporal HTTP API is enabled (`matrix_corporal_http_api_enabled`), but no auth token has been set in `matrix_corporal_http_api_auth_token`"
   when: "matrix_corporal_http_api_enabled | bool and matrix_corporal_http_api_auth_token == ''"
-
-- name: (Deprecation) Catch and report renamed corporal variables
-  ansible.builtin.fail:
-    msg: >-
-      Your configuration contains a variable, which now has a different name.
-      Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
-  when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
-  with_items:
-    - {'old': 'matrix_corporal_container_expose_ports', 'new': '<superseded by matrix_corporal_container_http_gateway_host_bind_port and matrix_corporal_container_http_api_host_bind_port>'}
-    - {'old': 'matrix_corporal_reconciliation_user_id_local_part', 'new': 'matrix_corporal_corporal_user_id_local_part'}
-    - {'old': 'matrix_corporal_container_image_name_prefix', 'new': 'matrix_corporal_docker_image_registry_prefix'}

roles/custom/matrix-corporal/templates/systemd/matrix-corporal.service.j2

@@ -34,7 +34,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_corporal_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_corporal_docker_image }} \
+			{{ matrix_corporal_container_image }} \
 			/matrix-corporal -config=/etc/matrix-corporal/config.json
 
 {% for network in matrix_corporal_container_additional_networks %}