mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-02-28 18:03:10 +00:00
Rename _docker_ vars to _container_ for kakaotalk, telegram, synapse
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:
@@ -55,15 +55,15 @@
|
||||
- {path: "{{ matrix_mautrix_telegram_base_path }}", when: true}
|
||||
- {path: "{{ matrix_mautrix_telegram_config_path }}", when: true}
|
||||
- {path: "{{ matrix_mautrix_telegram_data_path }}", when: true}
|
||||
- {path: "{{ matrix_mautrix_telegram_docker_src_files_path }}", when: "{{ matrix_mautrix_telegram_container_image_self_build }}"}
|
||||
- {path: "{{ matrix_mautrix_telegram_container_src_files_path }}", when: "{{ matrix_mautrix_telegram_container_image_self_build }}"}
|
||||
when: item.when | bool
|
||||
|
||||
- name: Ensure Mautrix Telegram image is pulled
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_mautrix_telegram_docker_image }}"
|
||||
name: "{{ matrix_mautrix_telegram_container_image }}"
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_mautrix_telegram_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_mautrix_telegram_docker_image_force_pull }}"
|
||||
force_source: "{{ matrix_mautrix_telegram_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_mautrix_telegram_container_image_force_pull }}"
|
||||
when: "not matrix_mautrix_telegram_container_image_self_build | bool"
|
||||
register: matrix_mautrix_telegram_container_image_pull_result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
@@ -72,9 +72,9 @@
|
||||
|
||||
- name: Ensure lottieconverter is present when self-building
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_mautrix_telegram_lottieconverter_docker_repo }}"
|
||||
version: "{{ matrix_mautrix_telegram_lottieconverter_docker_repo_version }}"
|
||||
dest: "{{ matrix_mautrix_telegram_lottieconverter_docker_src_files_path }}"
|
||||
repo: "{{ matrix_mautrix_telegram_lottieconverter_container_repo }}"
|
||||
version: "{{ matrix_mautrix_telegram_lottieconverter_container_repo_version }}"
|
||||
dest: "{{ matrix_mautrix_telegram_lottieconverter_container_src_files_path }}"
|
||||
force: "yes"
|
||||
become: true
|
||||
become_user: "{{ matrix_user_name }}"
|
||||
@@ -83,21 +83,21 @@
|
||||
|
||||
- name: Ensure lottieconverter Docker image is built
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_mautrix_telegram_lottieconverter_docker_image }}"
|
||||
name: "{{ matrix_mautrix_telegram_lottieconverter_container_image }}"
|
||||
source: build
|
||||
force_source: "{{ matrix_mautrix_telegram_lottieconverter_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_mautrix_telegram_lottieconverter_git_pull_results.changed }}"
|
||||
build:
|
||||
dockerfile: Dockerfile
|
||||
path: "{{ matrix_mautrix_telegram_lottieconverter_docker_src_files_path }}"
|
||||
path: "{{ matrix_mautrix_telegram_lottieconverter_container_src_files_path }}"
|
||||
pull: true
|
||||
when: "matrix_mautrix_telegram_lottieconverter_container_image_self_build | bool and matrix_mautrix_telegram_lottieconverter_git_pull_results.changed and matrix_mautrix_telegram_container_image_self_build | bool"
|
||||
|
||||
- name: Ensure matrix-mautrix-telegram repository is present when self-building
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_mautrix_telegram_docker_repo }}"
|
||||
version: "{{ matrix_mautrix_telegram_docker_repo_version }}"
|
||||
dest: "{{ matrix_mautrix_telegram_docker_src_files_path }}"
|
||||
repo: "{{ matrix_mautrix_telegram_container_repo }}"
|
||||
version: "{{ matrix_mautrix_telegram_container_repo_version }}"
|
||||
dest: "{{ matrix_mautrix_telegram_container_src_files_path }}"
|
||||
force: "yes"
|
||||
become: true
|
||||
become_user: "{{ matrix_user_name }}"
|
||||
@@ -106,13 +106,13 @@
|
||||
|
||||
- name: Ensure matrix-mautrix-telegram Docker image is built
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_mautrix_telegram_docker_image }}"
|
||||
name: "{{ matrix_mautrix_telegram_container_image }}"
|
||||
source: build
|
||||
force_source: "{{ matrix_mautrix_telegram_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_mautrix_telegram_git_pull_results.changed }}"
|
||||
build:
|
||||
dockerfile: Dockerfile
|
||||
path: "{{ matrix_mautrix_telegram_docker_src_files_path }}"
|
||||
path: "{{ matrix_mautrix_telegram_container_src_files_path }}"
|
||||
pull: "{{ not matrix_mautrix_telegram_lottieconverter_container_image_self_build_mask_arch | bool }}"
|
||||
args:
|
||||
TARGETARCH: ""
|
||||
|
||||
Reference in New Issue
Block a user