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

@@ -30,16 +30,16 @@ matrix_registration_container_image_self_build_python_dependencies_patch_enabled
 matrix_registration_base_path: "{{ matrix_base_data_path }}/matrix-registration"
 matrix_registration_config_path: "{{ matrix_registration_base_path }}/config"
 matrix_registration_data_path: "{{ matrix_registration_base_path }}/data"
-matrix_registration_docker_src_files_path: "{{ matrix_registration_base_path }}/docker-src"
+matrix_registration_container_src_files_path: "{{ matrix_registration_base_path }}/docker-src"
 
 # renovate: datasource=docker depName=zeratax/matrix-registration
 matrix_registration_version: "v0.7.2"
 
-matrix_registration_docker_image: "{{ matrix_registration_docker_image_registry_prefix }}zeratax/matrix-registration:{{ matrix_registration_version }}"
-matrix_registration_docker_image_registry_prefix: "{{ 'localhost/' if matrix_registration_container_image_self_build else matrix_registration_docker_image_registry_prefix_upstream }}"
-matrix_registration_docker_image_registry_prefix_upstream: "{{ matrix_registration_docker_image_registry_prefix_upstream_default }}"
-matrix_registration_docker_image_registry_prefix_upstream_default: "docker.io/"
-matrix_registration_docker_image_force_pull: "{{ matrix_registration_docker_image.endswith(':latest') }}"
+matrix_registration_container_image: "{{ matrix_registration_container_image_registry_prefix }}zeratax/matrix-registration:{{ matrix_registration_version }}"
+matrix_registration_container_image_registry_prefix: "{{ 'localhost/' if matrix_registration_container_image_self_build else matrix_registration_container_image_registry_prefix_upstream }}"
+matrix_registration_container_image_registry_prefix_upstream: "{{ matrix_registration_container_image_registry_prefix_upstream_default }}"
+matrix_registration_container_image_registry_prefix_upstream_default: "docker.io/"
+matrix_registration_container_image_force_pull: "{{ matrix_registration_container_image.endswith(':latest') }}"
 
 matrix_registration_container_network: ""
 

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

@@ -53,15 +53,15 @@
     - {path: "{{ matrix_registration_base_path }}", when: true}
     - {path: "{{ matrix_registration_config_path }}", when: true}
     - {path: "{{ matrix_registration_data_path }}", when: true}
-    - {path: "{{ matrix_registration_docker_src_files_path }}", when: "{{ matrix_registration_container_image_self_build }}"}
+    - {path: "{{ matrix_registration_container_src_files_path }}", when: "{{ matrix_registration_container_image_self_build }}"}
   when: "item.when | bool"
 
 - name: Ensure matrix-registration image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_registration_docker_image }}"
+    name: "{{ matrix_registration_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_registration_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_registration_docker_image_force_pull }}"
+    force_source: "{{ matrix_registration_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_registration_container_image_force_pull }}"
   when: "not matrix_registration_container_image_self_build | bool"
   register: matrix_registration_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -71,7 +71,7 @@
 - name: Ensure matrix-registration repository is present when self-building
   ansible.builtin.git:
     repo: "{{ matrix_registration_container_image_self_build_repo }}"
-    dest: "{{ matrix_registration_docker_src_files_path }}"
+    dest: "{{ matrix_registration_container_src_files_path }}"
     version: "{{ matrix_registration_container_image_self_build_branch }}"
     force: "yes"
   become: true
@@ -82,20 +82,20 @@
 # See: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1864
 - name: Patch setup.py to allow self-built version to work
   ansible.builtin.lineinfile:
-    path: "{{ matrix_registration_docker_src_files_path }}/setup.py"
+    path: "{{ matrix_registration_container_src_files_path }}/setup.py"
     regexp: 'flask-limiter'
     line: '"flask-limiter~=1.1.0", "Markupsafe<2.1",'
   when: "matrix_registration_container_image_self_build | bool and matrix_registration_container_image_self_build_python_dependencies_patch_enabled | bool"
 
 - name: Ensure matrix-registration Docker image is built
   community.docker.docker_image:
-    name: "{{ matrix_registration_docker_image }}"
+    name: "{{ matrix_registration_container_image }}"
     source: build
     force_source: "{{ matrix_registration_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_registration_git_pull_results.changed }}"
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_registration_docker_src_files_path }}"
+      path: "{{ matrix_registration_container_src_files_path }}"
       pull: true
   when: "matrix_registration_container_image_self_build | bool"
 

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

@@ -5,6 +5,22 @@
 
 ---
 
+- name: (Deprecation) Catch and report renamed settings
+  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_registration_docker_repo', 'new': 'matrix_registration_container_image_self_build_repo'}
+    - {'old': 'matrix_registration_public_endpoint', 'new': 'matrix_registration_path_prefix'}
+    - {'old': 'matrix_registration_docker_image', 'new': 'matrix_registration_container_image'}
+    - {'old': 'matrix_registration_docker_image_force_pull', 'new': 'matrix_registration_container_image_force_pull'}
+    - {'old': 'matrix_registration_docker_image_registry_prefix', 'new': 'matrix_registration_container_image_registry_prefix'}
+    - {'old': 'matrix_registration_docker_image_registry_prefix_upstream', 'new': 'matrix_registration_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_registration_docker_image_registry_prefix_upstream_default', 'new': 'matrix_registration_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_registration_docker_src_files_path', 'new': 'matrix_registration_container_src_files_path'}
+
 - name: Fail if required matrix-registration settings not defined
   ansible.builtin.fail:
     msg: >
@@ -18,13 +34,3 @@
     - {'name': 'matrix_registration_admin_secret', when: true}
     - {'name': 'matrix_registration_server_location', when: true}
     - {'name': 'matrix_registration_database_hostname', when: "{{ matrix_registration_database_engine == 'postgres' }}"}
-
-- name: (Deprecation) Catch and report renamed settings
-  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_registration_docker_repo', 'new': 'matrix_registration_container_image_self_build_repo'}
-    - {'old': 'matrix_registration_public_endpoint', 'new': 'matrix_registration_path_prefix'}

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

@@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_registration_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_registration_docker_image }} \
+			{{ matrix_registration_container_image }} \
 			serve
 
 {% for network in matrix_registration_container_additional_networks %}