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

@@ -13,9 +13,9 @@ matrix_cactus_comments_enabled: true
 
 matrix_cactus_comments_container_image_self_build: false
 
-matrix_cactus_comments_docker_repo: "https://gitlab.com/cactus-comments/cactus-appservice.git"
-matrix_cactus_comments_docker_repo_version: "{{ matrix_cactus_comments_version if matrix_cactus_comments_version != 'latest' else 'main' }}"
-matrix_cactus_comments_docker_src_files_path: "{{ matrix_cactus_comments_base_path }}/docker-src"
+matrix_cactus_comments_container_repo: "https://gitlab.com/cactus-comments/cactus-appservice.git"
+matrix_cactus_comments_container_repo_version: "{{ matrix_cactus_comments_version if matrix_cactus_comments_version != 'latest' else 'main' }}"
+matrix_cactus_comments_container_src_files_path: "{{ matrix_cactus_comments_base_path }}/docker-src"
 
 matrix_cactus_comments_base_path: "{{ matrix_base_data_path }}/cactus-comments"
 matrix_cactus_comments_container_tmp_path: "{{ matrix_cactus_comments_base_path }}/tmp"
@@ -33,12 +33,12 @@ matrix_cactus_comments_container_port: 5000
 
 # renovate: datasource=docker depName=cactuscomments/cactus-appservice
 matrix_cactus_comments_version: 0.9.0
-matrix_cactus_comments_docker_image: "{{ matrix_cactus_comments_docker_image_registry_prefix }}cactuscomments/cactus-appservice:{{ matrix_cactus_comments_docker_image_tag }}"
-matrix_cactus_comments_docker_image_registry_prefix: "{{ 'localhost/' if matrix_cactus_comments_container_image_self_build else matrix_cactus_comments_docker_image_registry_prefix_upstream }}"
-matrix_cactus_comments_docker_image_registry_prefix_upstream: "{{ matrix_cactus_comments_docker_image_registry_prefix_upstream_default }}"
-matrix_cactus_comments_docker_image_registry_prefix_upstream_default: docker.io/
-matrix_cactus_comments_docker_image_tag: "{{ matrix_cactus_comments_version }}"
-matrix_cactus_comments_docker_image_force_pull: "{{ matrix_cactus_comments_docker_image.endswith(':latest') }}"
+matrix_cactus_comments_container_image: "{{ matrix_cactus_comments_container_image_registry_prefix }}cactuscomments/cactus-appservice:{{ matrix_cactus_comments_container_image_tag }}"
+matrix_cactus_comments_container_image_registry_prefix: "{{ 'localhost/' if matrix_cactus_comments_container_image_self_build else matrix_cactus_comments_container_image_registry_prefix_upstream }}"
+matrix_cactus_comments_container_image_registry_prefix_upstream: "{{ matrix_cactus_comments_container_image_registry_prefix_upstream_default }}"
+matrix_cactus_comments_container_image_registry_prefix_upstream_default: docker.io/
+matrix_cactus_comments_container_image_tag: "{{ matrix_cactus_comments_version }}"
+matrix_cactus_comments_container_image_force_pull: "{{ matrix_cactus_comments_container_image.endswith(':latest') }}"
 
 matrix_cactus_comments_container_network: ""
 

roles/custom/matrix-cactus-comments/tasks/setup_install.yml

@@ -16,7 +16,7 @@
   with_items:
     - {path: "{{ matrix_cactus_comments_base_path }}", when: true}
     - {path: "{{ matrix_cactus_comments_container_tmp_path }}", when: true}
-    - {path: "{{ matrix_cactus_comments_docker_src_files_path }}", when: "{{ matrix_cactus_comments_container_image_self_build }}"}
+    - {path: "{{ matrix_cactus_comments_container_src_files_path }}", when: "{{ matrix_cactus_comments_container_image_self_build }}"}
   when: "item.when | bool"
 
 - name: Ensure matrix-cactus-comments environment file created
@@ -39,10 +39,10 @@
 
 - name: Ensure matrix-cactus-comments image is pulled
   community.docker.docker_image:
-    name: "{{ matrix_cactus_comments_docker_image }}"
+    name: "{{ matrix_cactus_comments_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_cactus_comments_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_cactus_comments_docker_image_force_pull }}"
+    force_source: "{{ matrix_cactus_comments_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_cactus_comments_container_image_force_pull }}"
   when: "not matrix_cactus_comments_container_image_self_build | bool"
   register: matrix_cactus_comments_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -51,9 +51,9 @@
 
 - name: Ensure matrix-cactus-comments repository is present on self-build
   ansible.builtin.git:
-    repo: "{{ matrix_cactus_comments_docker_repo }}"
-    version: "{{ matrix_cactus_comments_docker_repo_version }}"
-    dest: "{{ matrix_cactus_comments_docker_src_files_path }}"
+    repo: "{{ matrix_cactus_comments_container_repo }}"
+    version: "{{ matrix_cactus_comments_container_repo_version }}"
+    dest: "{{ matrix_cactus_comments_container_src_files_path }}"
     force: "yes"
   become: true
   become_user: "{{ matrix_user_name }}"
@@ -62,13 +62,13 @@
 
 - name: Ensure matrix-cactus-comments image is built
   community.docker.docker_image:
-    name: "{{ matrix_cactus_comments_docker_image }}"
+    name: "{{ matrix_cactus_comments_container_image }}"
     source: build
     force_source: "{{ matrix_cactus_comments_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_cactus_comments_git_pull_results.changed }}"
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_cactus_comments_docker_src_files_path }}"
+      path: "{{ matrix_cactus_comments_container_src_files_path }}"
       pull: true
   when: "matrix_cactus_comments_container_image_self_build | bool"
 

roles/custom/matrix-cactus-comments/tasks/validate_config.yml

@@ -19,6 +19,15 @@
     - {'old': 'matrix_cactus_comments_client_nginx_path', 'new': '<superseded by Traefik labels controlled by matrix_cactus_comments_client_container_labels_traefik_* variables>'}
     - {'old': 'matrix_cactus_comments_client_path', 'new': '<superseded by matrix_cactus_comments_client_base_path and matrix_cactus_comments_client_public_path>'}
     - {'old': 'matrix_cactus_comments_serve_client_enabled', 'new': 'matrix_cactus_comments_client_enabled'}
+    - {'old': 'matrix_cactus_comments_docker_image', 'new': 'matrix_cactus_comments_container_image'}
+    - {'old': 'matrix_cactus_comments_docker_image_force_pull', 'new': 'matrix_cactus_comments_container_image_force_pull'}
+    - {'old': 'matrix_cactus_comments_docker_image_registry_prefix', 'new': 'matrix_cactus_comments_container_image_registry_prefix'}
+    - {'old': 'matrix_cactus_comments_docker_image_registry_prefix_upstream', 'new': 'matrix_cactus_comments_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_cactus_comments_docker_image_registry_prefix_upstream_default', 'new': 'matrix_cactus_comments_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_cactus_comments_docker_image_tag', 'new': 'matrix_cactus_comments_container_image_tag'}
+    - {'old': 'matrix_cactus_comments_docker_repo', 'new': 'matrix_cactus_comments_container_repo'}
+    - {'old': 'matrix_cactus_comments_docker_repo_version', 'new': 'matrix_cactus_comments_container_repo_version'}
+    - {'old': 'matrix_cactus_comments_docker_src_files_path', 'new': 'matrix_cactus_comments_container_src_files_path'}
 
 - name: Fail if required matrix-cactus-comments settings not defined
   ansible.builtin.fail:

roles/custom/matrix-cactus-comments/templates/systemd/matrix-cactus-comments.service.j2

@@ -26,7 +26,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			--env-file {{ matrix_cactus_comments_app_service_env_file }} \
 			--tmpfs=/tmp:rw,noexec,nosuid,size={{ matrix_cactus_comments_tmp_directory_size_mb }}m \
 			--network={{ matrix_cactus_comments_container_network }} \
-			{{ matrix_cactus_comments_docker_image }}
+			{{ matrix_cactus_comments_container_image }}
 
 {% for network in matrix_cactus_comments_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-cactus-comments