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

@@ -23,14 +23,14 @@ matrix_dendrite_hostname: ''
 matrix_dendrite_container_image_self_build: false
 matrix_dendrite_container_image_self_build_repo: "https://github.com/matrix-org/dendrite.git"
 
-matrix_dendrite_docker_image_path: "matrixdotorg/dendrite-monolith"
-matrix_dendrite_docker_image: "{{ matrix_dendrite_docker_image_registry_prefix }}{{ matrix_dendrite_docker_image_path }}:{{ matrix_dendrite_docker_image_tag }}"
-matrix_dendrite_docker_image_registry_prefix: "{{ 'localhost/' if matrix_dendrite_container_image_self_build else matrix_dendrite_docker_image_registry_prefix_upstream }}"
-matrix_dendrite_docker_image_registry_prefix_upstream: "{{ matrix_dendrite_docker_image_registry_prefix_upstream_default }}"
-matrix_dendrite_docker_image_registry_prefix_upstream_default: docker.io/
+matrix_dendrite_container_image_path: "matrixdotorg/dendrite-monolith"
+matrix_dendrite_container_image: "{{ matrix_dendrite_container_image_registry_prefix }}{{ matrix_dendrite_container_image_path }}:{{ matrix_dendrite_container_image_tag }}"
+matrix_dendrite_container_image_registry_prefix: "{{ 'localhost/' if matrix_dendrite_container_image_self_build else matrix_dendrite_container_image_registry_prefix_upstream }}"
+matrix_dendrite_container_image_registry_prefix_upstream: "{{ matrix_dendrite_container_image_registry_prefix_upstream_default }}"
+matrix_dendrite_container_image_registry_prefix_upstream_default: docker.io/
 # renovate: datasource=docker depName=matrixdotorg/dendrite-monolith
-matrix_dendrite_docker_image_tag: "v0.15.2"
-matrix_dendrite_docker_image_force_pull: "{{ matrix_dendrite_docker_image.endswith(':latest') }}"
+matrix_dendrite_container_image_tag: "v0.15.2"
+matrix_dendrite_container_image_force_pull: "{{ matrix_dendrite_container_image.endswith(':latest') }}"
 
 matrix_dendrite_base_path: "{{ matrix_base_data_path }}/dendrite"
 matrix_dendrite_config_dir_path: "{{ matrix_dendrite_base_path }}/config"
@@ -40,7 +40,7 @@ matrix_dendrite_nats_storage_path: "{{ matrix_dendrite_base_path }}/nats"
 matrix_dendrite_bin_path: "{{ matrix_dendrite_base_path }}/bin"
 matrix_dendrite_ext_path: "{{ matrix_dendrite_base_path }}/ext"
 
-matrix_dendrite_docker_src_files_path: "{{ matrix_dendrite_base_path }}/docker-src"
+matrix_dendrite_container_src_files_path: "{{ matrix_dendrite_base_path }}/docker-src"
 
 # By default, we make Dendrite only serve HTTP (not HTTPS).
 # HTTPS is usually served at the reverse-proxy side.

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

@@ -26,7 +26,7 @@
       when: true
     - path: "{{ matrix_dendrite_nats_storage_path }}"
       when: true
-    - path: "{{ matrix_dendrite_docker_src_files_path }}"
+    - path: "{{ matrix_dendrite_container_src_files_path }}"
       when: "{{ matrix_dendrite_container_image_self_build }}"
   when: "item.when | bool"
 
@@ -50,10 +50,10 @@
 
 - name: Ensure Dendrite Docker image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_dendrite_docker_image }}"
+    name: "{{ matrix_dendrite_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_dendrite_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_dendrite_docker_image_force_pull }}"
+    force_source: "{{ matrix_dendrite_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_dendrite_container_image_force_pull }}"
   when: "not matrix_dendrite_container_image_self_build | bool"
   register: result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -71,7 +71,7 @@
       --name=matrix-dendrite-config
       --entrypoint=generate-keys
       --mount type=bind,src={{ matrix_dendrite_config_dir_path }},dst=/data
-      {{ matrix_dendrite_docker_image }} --private-key=/data/{{ matrix_server_fqn_matrix }}.signing.pem
+      {{ matrix_dendrite_container_image }} --private-key=/data/{{ matrix_server_fqn_matrix }}.signing.pem
       generate
     creates: "{{ matrix_dendrite_config_dir_path }}/{{ matrix_server_fqn_matrix }}.signing.pem"
 
@@ -95,16 +95,16 @@
     - name: Ensure Dendrite repository is present on self-build
       ansible.builtin.git:
         repo: "{{ matrix_dendrite_container_image_self_build_repo }}"
-        dest: "{{ matrix_dendrite_docker_src_files_path }}"
-        version: "{{ matrix_dendrite_docker_image.split(':')[1] }}"
+        dest: "{{ matrix_dendrite_container_src_files_path }}"
+        version: "{{ matrix_dendrite_container_image.split(':')[1] }}"
         force: "yes"
       become: true
       become_user: "{{ matrix_user_name }}"
       register: matrix_dendrite_git_pull_results
 
     - name: Check if Dendrite Docker image exists
-      ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ matrix_dendrite_docker_image }}'"
-      register: matrix_dendrite_docker_image_check_result
+      ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ matrix_dendrite_container_image }}'"
+      register: matrix_dendrite_container_image_check_result
       changed_when: false
 
     # Invoking the `docker build` command here, instead of calling the `docker_image` Ansible module,
@@ -112,11 +112,11 @@
     # See: https://github.com/ansible-collections/community.general/issues/514
     - name: Ensure Dendrite Docker image is built
       ansible.builtin.command:
-        cmd: "{{ devture_systemd_docker_base_host_command_docker }} build -t {{ matrix_dendrite_docker_image }} {{ matrix_dendrite_docker_src_files_path }}"
+        cmd: "{{ devture_systemd_docker_base_host_command_docker }} build -t {{ matrix_dendrite_container_image }} {{ matrix_dendrite_container_src_files_path }}"
       environment:
         DOCKER_BUILDKIT: 1
       changed_when: true
-      when: "matrix_dendrite_git_pull_results.changed | bool or matrix_dendrite_docker_image_check_result.stdout == ''"
+      when: "matrix_dendrite_git_pull_results.changed | bool or matrix_dendrite_container_image_check_result.stdout == ''"
 
 - name: Ensure Dendrite container network is created
   community.general.docker_network:

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

@@ -34,7 +34,15 @@
     - {'old': 'matrix_dendrite_pushserver_database', 'new': 'matrix_dendrite_push_server_database'}
     - {'old': 'matrix_dendrite_relayapi_database', 'new': 'matrix_dendrite_relay_api_database'}
     - {'old': 'matrix_dendrite_keyserver_database', 'new': 'matrix_dendrite_key_server_database'}
-    - {'old': 'matrix_dendrite_container_image_name_prefix', 'new': 'matrix_dendrite_docker_image_registry_prefix'}
+    - {'old': 'matrix_dendrite_container_image_name_prefix', 'new': 'matrix_dendrite_container_image_registry_prefix'}
+    - {'old': 'matrix_dendrite_docker_image', 'new': 'matrix_dendrite_container_image'}
+    - {'old': 'matrix_dendrite_docker_image_force_pull', 'new': 'matrix_dendrite_container_image_force_pull'}
+    - {'old': 'matrix_dendrite_docker_image_path', 'new': 'matrix_dendrite_container_image_path'}
+    - {'old': 'matrix_dendrite_docker_image_registry_prefix', 'new': 'matrix_dendrite_container_image_registry_prefix'}
+    - {'old': 'matrix_dendrite_docker_image_registry_prefix_upstream', 'new': 'matrix_dendrite_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_dendrite_docker_image_registry_prefix_upstream_default', 'new': 'matrix_dendrite_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_dendrite_docker_image_tag', 'new': 'matrix_dendrite_container_image_tag'}
+    - {'old': 'matrix_dendrite_docker_src_files_path', 'new': 'matrix_dendrite_container_src_files_path'}
 
 - name: Fail if required Dendrite settings not defined
   ansible.builtin.fail:

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

@@ -47,7 +47,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_dendrite_container_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_dendrite_docker_image }} \
+			{{ matrix_dendrite_container_image }} \
 			-config /data/dendrite.yaml \
 			{{ matrix_dendrite_process_extra_arguments|join(' ') }} \
 			{% if matrix_dendrite_http_bind_address %}