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-bridge-mx-puppet-groupme/defaults/main.yml

@@ -25,16 +25,16 @@ matrix_mx_puppet_groupme_container_image_self_build_repo_version: "{{ 'main' if
 matrix_mx_puppet_groupme_container_http_host_bind_port: ''
 
 matrix_mx_puppet_groupme_version: 533cccc8
-matrix_mx_puppet_groupme_docker_image: "{{ matrix_mx_puppet_groupme_docker_image_registry_prefix }}xangelix-pub/matrix/mx-puppet-groupme:{{ matrix_mx_puppet_groupme_version }}"
-matrix_mx_puppet_groupme_docker_image_registry_prefix: "{{ 'localhost/' if matrix_mx_puppet_groupme_container_image_self_build else matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream }}"
-matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream: "{{ matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream_default }}"
-matrix_mx_puppet_groupme_docker_image_registry_prefix_upstream_default: "registry.gitlab.com/"
-matrix_mx_puppet_groupme_docker_image_force_pull: "{{ matrix_mx_puppet_groupme_docker_image.endswith(':latest') }}"
+matrix_mx_puppet_groupme_container_image: "{{ matrix_mx_puppet_groupme_container_image_registry_prefix }}xangelix-pub/matrix/mx-puppet-groupme:{{ matrix_mx_puppet_groupme_version }}"
+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"
 matrix_mx_puppet_groupme_data_path: "{{ matrix_mx_puppet_groupme_base_path }}/data"
-matrix_mx_puppet_groupme_docker_src_files_path: "{{ matrix_mx_puppet_groupme_base_path }}/docker-src"
+matrix_mx_puppet_groupme_container_src_files_path: "{{ matrix_mx_puppet_groupme_base_path }}/docker-src"
 
 matrix_mx_puppet_groupme_appservice_port: "8437"
 

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

@@ -21,7 +21,7 @@
     - {path: "{{ matrix_mx_puppet_groupme_base_path }}", when: true}
     - {path: "{{ matrix_mx_puppet_groupme_config_path }}", when: true}
     - {path: "{{ matrix_mx_puppet_groupme_data_path }}", when: true}
-    - {path: "{{ matrix_mx_puppet_groupme_docker_src_files_path }}", when: "{{ matrix_mx_puppet_groupme_container_image_self_build }}"}
+    - {path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}", when: "{{ matrix_mx_puppet_groupme_container_image_self_build }}"}
   when: matrix_mx_puppet_groupme_enabled | bool and item.when | bool
 
 - name: Check if an old database file already exists
@@ -74,10 +74,10 @@
 
 - name: Ensure MX Puppet Groupme image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_mx_puppet_groupme_docker_image }}"
+    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_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_mx_puppet_groupme_docker_image_force_pull }}"
+    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 }}"
   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 }}"
@@ -88,7 +88,7 @@
   ansible.builtin.git:
     repo: "{{ matrix_mx_puppet_groupme_container_image_self_build_repo }}"
     version: "{{ matrix_mx_puppet_groupme_container_image_self_build_repo_version }}"
-    dest: "{{ matrix_mx_puppet_groupme_docker_src_files_path }}"
+    dest: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
     force: "yes"
   become: true
   become_user: "{{ matrix_user_name }}"
@@ -97,13 +97,13 @@
 
 - name: Ensure MX Puppet Groupme Docker image is built
   community.docker.docker_image:
-    name: "{{ matrix_mx_puppet_groupme_docker_image }}"
+    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_docker_src_files_path }}"
+      path: "{{ matrix_mx_puppet_groupme_container_src_files_path }}"
       pull: true
   when: "matrix_mx_puppet_groupme_enabled | bool and matrix_mx_puppet_groupme_container_image_self_build"
 

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

@@ -5,6 +5,20 @@
 
 ---
 
+- name: (Deprecation) Catch and report renamed mx-puppet-groupme 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_mx_puppet_groupme_docker_image_name_prefix', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix'}
+    - {'old': 'matrix_mx_puppet_groupme_docker_image', 'new': 'matrix_mx_puppet_groupme_container_image'}
+    - {'old': 'matrix_mx_puppet_groupme_docker_image_force_pull', 'new': 'matrix_mx_puppet_groupme_container_image_force_pull'}
+    - {'old': 'matrix_mx_puppet_groupme_docker_image_registry_prefix', 'new': 'matrix_mx_puppet_groupme_container_image_registry_prefix'}
+    - {'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'}
+
 - name: Fail if required mx-puppet-groupme settings not defined
   ansible.builtin.fail:
     msg: >-
@@ -16,11 +30,3 @@
     - {'name': 'matrix_mx_puppet_groupme_homeserver_token', when: true}
     - {'name': 'matrix_mx_puppet_groupme_database_hostname', when: "{{ matrix_mx_puppet_groupme_database_engine == 'postgres' }}"}
     - {'name': 'matrix_mx_puppet_groupme_container_network', when: true}
-
-- name: (Deprecation) Catch and report renamed mx-puppet-groupme 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_mx_puppet_groupme_docker_image_name_prefix', 'new': 'matrix_mx_puppet_groupme_docker_image_registry_prefix'}

roles/custom/matrix-bridge-mx-puppet-groupme/templates/systemd/matrix-mx-puppet-groupme.service.j2

@@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in matrix_mx_puppet_groupme_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ matrix_mx_puppet_groupme_docker_image }}
+			{{ matrix_mx_puppet_groupme_container_image }}
 
 {% for network in matrix_mx_puppet_groupme_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-mx-puppet-groupme