cqrenet/matrix-docker-ansible-deploy
3
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-02-28 09:53:09 +00:00
Code Issues Wiki Activity

Rename _docker_ vars to _container_ across 34 roles

Browse Source 
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>
This commit is contained in:
Slavi Pantaleev
2026-02-18 07:58:15 +02:00
parent 78d9f725b3
commit f0e0f5ec56
137 changed files with 1003 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/custom/matrix-client-schildichat/defaults/main.yml
View File

@@ -20,11 +20,11 @@ matrix_client_schildichat_container_image_self_build_low_memory_system_patch_ena
# renovate: datasource=docker depName=ghcr.io/etkecc/schildichat-web
matrix_client_schildichat_version: 1.11.109-sc.0.test.0
matrix_client_schildichat_docker_image: "{{ matrix_client_schildichat_docker_image_registry_prefix }}etkecc/schildichat-web:{{ matrix_client_schildichat_version }}"
matrix_client_schildichat_docker_image_registry_prefix: "{{ 'localhost/' if matrix_client_schildichat_container_image_self_build else matrix_client_schildichat_docker_image_registry_prefix_upstream }}"
matrix_client_schildichat_docker_image_registry_prefix_upstream: "{{ matrix_client_schildichat_docker_image_registry_prefix_upstream_default }}"
matrix_client_schildichat_docker_image_registry_prefix_upstream_default: ghcr.io/
matrix_client_schildichat_docker_image_force_pull: "{{ matrix_client_schildichat_docker_image.endswith(':latest') }}"
matrix_client_schildichat_container_image: "{{ matrix_client_schildichat_container_image_registry_prefix }}etkecc/schildichat-web:{{ matrix_client_schildichat_version }}"
matrix_client_schildichat_container_image_registry_prefix: "{{ 'localhost/' if matrix_client_schildichat_container_image_self_build else matrix_client_schildichat_container_image_registry_prefix_upstream }}"
matrix_client_schildichat_container_image_registry_prefix_upstream: "{{ matrix_client_schildichat_container_image_registry_prefix_upstream_default }}"
matrix_client_schildichat_container_image_registry_prefix_upstream_default: ghcr.io/
matrix_client_schildichat_container_image_force_pull: "{{ matrix_client_schildichat_container_image.endswith(':latest') }}"
matrix_client_schildichat_data_path: "{{ matrix_base_data_path }}/client-schildichat"
matrix_client_schildichat_container_src_files_path: "{{ matrix_client_schildichat_data_path }}/docker-src"

8
roles/custom/matrix-client-schildichat/tasks/setup_install.yml
View File

@@ -22,10 +22,10 @@
- name: Ensure SchildiChat Web container image is pulled
community.docker.docker_image:
name: "{{ matrix_client_schildichat_docker_image }}"
name: "{{ matrix_client_schildichat_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_client_schildichat_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_client_schildichat_docker_image_force_pull }}"
force_source: "{{ matrix_client_schildichat_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_client_schildichat_container_image_force_pull }}"
when: "not matrix_client_schildichat_container_image_self_build | bool"
register: matrix_client_schildichat_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -62,7 +62,7 @@
ansible.builtin.command:
cmd: |-
{{ devture_systemd_docker_base_host_command_docker }} buildx build
--tag={{ matrix_client_schildichat_docker_image }}
--tag={{ matrix_client_schildichat_container_image }}
--file={{ matrix_client_schildichat_container_src_files_path }}/Dockerfile
{{ matrix_client_schildichat_container_src_files_path }}
changed_when: true

5
roles/custom/matrix-client-schildichat/tasks/validate_config.yml
View File

@@ -15,6 +15,11 @@
with_items:
- {'old': 'matrix_client_schildichat_welcome_user_id', 'new': '<removed>'}
- {'old': 'matrix_client_schildichat_container_image_name_prefix', 'new': 'matrix_client_schildichat_container_image_registry_prefix'}
- {'old': 'matrix_client_schildichat_docker_image', 'new': 'matrix_client_schildichat_container_image'}
- {'old': 'matrix_client_schildichat_docker_image_force_pull', 'new': 'matrix_client_schildichat_container_image_force_pull'}
- {'old': 'matrix_client_schildichat_docker_image_registry_prefix', 'new': 'matrix_client_schildichat_container_image_registry_prefix'}
- {'old': 'matrix_client_schildichat_docker_image_registry_prefix_upstream', 'new': 'matrix_client_schildichat_container_image_registry_prefix_upstream'}
- {'old': 'matrix_client_schildichat_docker_image_registry_prefix_upstream_default', 'new': 'matrix_client_schildichat_container_image_registry_prefix_upstream_default'}
- name: Fail if required SchildiChat Web settings not defined
ansible.builtin.fail:

2
roles/custom/matrix-client-schildichat/templates/systemd/matrix-client-schildichat.service.j2
View File

@@ -38,7 +38,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for arg in matrix_client_schildichat_container_extra_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_client_schildichat_docker_image }}
{{ matrix_client_schildichat_container_image }}
{% for network in matrix_client_schildichat_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-client-schildichat