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

Rename _docker_ vars to _container_ for kakaotalk, telegram, synapse

Browse Source 
These three roles have multiple variable prefixes each:
- kakaotalk: matrix_appservice_kakaotalk + matrix_appservice_kakaotalk_node
- telegram: matrix_mautrix_telegram + matrix_mautrix_telegram_lottieconverter
- synapse: matrix_synapse + matrix_synapse_customized + matrix_synapse_rust_synapse_compress_state

For each: renamed _docker_image* to _container_image* (and _docker_src*,
_docker_repo* where applicable), added deprecation entries in
validate_config.yml, updated group_vars references, and moved
deprecation tasks to the front of validate_config.yml.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
2026-02-18 08:15:24 +02:00
parent f0e0f5ec56
commit ca2b6b0a27
22 changed files with 263 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/custom/matrix-synapse/templates/synapse/customizations/Dockerfile.j2
View File

@@ -1,6 +1,6 @@
#jinja2: lstrip_blocks: True
{% if matrix_synapse_container_image_customizations_templates_enabled %}
FROM {{ matrix_synapse_docker_image }} AS templates-builder
FROM {{ matrix_synapse_container_image }} AS templates-builder
{#
This ugly script below does quite a lot:
@@ -38,7 +38,7 @@ RUN rm -rf {{ matrix_synapse_container_image_customizations_templates_in_contain
RUN chown -R {{ matrix_synapse_uid }}:{{ matrix_synapse_gid }} {{ matrix_synapse_container_image_customizations_templates_in_container_base_path }}
{% endif %}
FROM {{ matrix_synapse_docker_image }}
FROM {{ matrix_synapse_container_image }}
{% if matrix_synapse_container_image_customizations_s3_storage_provider_installation_enabled %}
RUN pip install synapse-s3-storage-provider=={{ matrix_synapse_ext_synapse_s3_storage_provider_version }}

2
roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/bin/migrate.j2
View File

@@ -14,7 +14,7 @@ container_id=$(\
{% for arg in matrix_synapse_ext_s3_storage_provider_container_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_synapse_docker_image_final }} \
{{ matrix_synapse_container_image_final }} \
-c 's3_media_upload update-db $UPDATE_DB_DURATION && s3_media_upload --no-progress check-deleted $MEDIA_PATH && s3_media_upload --no-progress upload $MEDIA_PATH $BUCKET --delete --storage-class $STORAGE_CLASS --endpoint-url $ENDPOINT {% if matrix_synapse_ext_synapse_s3_storage_provider_config_sse_customer_enabled %}--sse-customer-algo $SSE_CUSTOMER_ALGO --sse-customer-key $SSE_CUSTOMER_KEY{% endif %}' \
)

2
roles/custom/matrix-synapse/templates/synapse/ext/s3-storage-provider/bin/shell.j2
View File

@@ -13,7 +13,7 @@ container_id=$(\
--workdir=/data \
--network={{ matrix_synapse_container_network }} \
--entrypoint=/bin/bash \
{{ matrix_synapse_docker_image_final }} \
{{ matrix_synapse_container_image_final }} \
)
{# We need to connect to the Postgres network, which should be in this list. #}

2
roles/custom/matrix-synapse/templates/synapse/systemd/matrix-synapse-worker.service.j2
View File

@@ -74,7 +74,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for arg in matrix_synapse_container_worker_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_synapse_docker_image_final }} \
{{ matrix_synapse_container_image_final }} \
run -m synapse.app.{{ matrix_synapse_worker_details.app }} -c /data/homeserver.yaml -c /data/{{ matrix_synapse_worker_config_file_name }}
{% for network in matrix_synapse_container_additional_networks %}

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

@@ -61,7 +61,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for arg in matrix_synapse_container_master_extra_arguments %}
{{ arg }} \
{% endfor %}
{{ matrix_synapse_docker_image_final }} \
{{ matrix_synapse_container_image_final }} \
run -m synapse.app.homeserver -c /data/homeserver.yaml
{% for network in matrix_synapse_container_additional_networks %}