mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-02-28 09:53:09 +00:00
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>
This commit is contained in:
@@ -20,15 +20,15 @@
|
||||
group: "{{ matrix_group_name }}"
|
||||
with_items:
|
||||
- {path: "{{ matrix_client_element_data_path }}", when: true}
|
||||
- {path: "{{ matrix_client_element_docker_src_files_path }}", when: "{{ matrix_client_element_container_image_self_build }}"}
|
||||
- {path: "{{ matrix_client_element_container_src_files_path }}", when: "{{ matrix_client_element_container_image_self_build }}"}
|
||||
when: "item.when | bool"
|
||||
|
||||
- name: Ensure Element Web Docker image is pulled
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_client_element_docker_image }}"
|
||||
name: "{{ matrix_client_element_container_image }}"
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_client_element_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_element_docker_image_force_pull }}"
|
||||
force_source: "{{ matrix_client_element_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_element_container_image_force_pull }}"
|
||||
when: "not matrix_client_element_container_image_self_build | bool"
|
||||
register: matrix_client_element_container_image_pull_result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
@@ -38,8 +38,8 @@
|
||||
- name: Ensure Element Web repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_client_element_container_image_self_build_repo }}"
|
||||
dest: "{{ matrix_client_element_docker_src_files_path }}"
|
||||
version: "{{ matrix_client_element_docker_image.split(':')[1] }}"
|
||||
dest: "{{ matrix_client_element_container_src_files_path }}"
|
||||
version: "{{ matrix_client_element_container_image.split(':')[1] }}"
|
||||
force: "yes"
|
||||
become: true
|
||||
become_user: "{{ matrix_user_name }}"
|
||||
@@ -51,7 +51,7 @@
|
||||
# - https://github.com/element-hq/element-web/issues/19544
|
||||
- name: Patch webpack.config.js to support building on low-memory (<4G RAM) devices
|
||||
ansible.builtin.lineinfile:
|
||||
path: "{{ matrix_client_element_docker_src_files_path }}/webpack.config.js"
|
||||
path: "{{ matrix_client_element_container_src_files_path }}/webpack.config.js"
|
||||
regexp: '(\s+)splitChunks: \{'
|
||||
line: '\1splitChunks: { maxSize: 100000,'
|
||||
backrefs: true
|
||||
@@ -64,9 +64,9 @@
|
||||
ansible.builtin.command:
|
||||
cmd: |-
|
||||
{{ devture_systemd_docker_base_host_command_docker }} buildx build
|
||||
--tag={{ matrix_client_element_docker_image }}
|
||||
--file={{ matrix_client_element_docker_src_files_path }}/Dockerfile
|
||||
{{ matrix_client_element_docker_src_files_path }}
|
||||
--tag={{ matrix_client_element_container_image }}
|
||||
--file={{ matrix_client_element_container_src_files_path }}/Dockerfile
|
||||
{{ matrix_client_element_container_src_files_path }}
|
||||
changed_when: true
|
||||
when: matrix_client_element_container_image_self_build | bool
|
||||
|
||||
|
||||
@@ -6,6 +6,30 @@
|
||||
|
||||
---
|
||||
|
||||
- name: (Deprecation) Catch and report renamed element-web settings
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Your configuration contains a variable, which now has a different name.
|
||||
Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
|
||||
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
|
||||
with_items:
|
||||
- {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
|
||||
- {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
|
||||
- {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
|
||||
- {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
|
||||
- {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
|
||||
- {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
|
||||
- {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
|
||||
- {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
|
||||
- {'old': 'matrix_client_element_welcome_user_id', 'new': '<removed>'}
|
||||
- {'old': 'matrix_client_element_docker_image_name_prefix', 'new': 'matrix_client_element_container_image_registry_prefix'}
|
||||
- {'old': 'matrix_client_element_docker_image', 'new': 'matrix_client_element_container_image'}
|
||||
- {'old': 'matrix_client_element_docker_image_force_pull', 'new': 'matrix_client_element_container_image_force_pull'}
|
||||
- {'old': 'matrix_client_element_docker_image_registry_prefix', 'new': 'matrix_client_element_container_image_registry_prefix'}
|
||||
- {'old': 'matrix_client_element_docker_image_registry_prefix_upstream', 'new': 'matrix_client_element_container_image_registry_prefix_upstream'}
|
||||
- {'old': 'matrix_client_element_docker_image_registry_prefix_upstream_default', 'new': 'matrix_client_element_container_image_registry_prefix_upstream_default'}
|
||||
- {'old': 'matrix_client_element_docker_src_files_path', 'new': 'matrix_client_element_container_src_files_path'}
|
||||
|
||||
- name: Fail if required Element Web settings not defined
|
||||
ansible.builtin.fail:
|
||||
msg: >
|
||||
@@ -33,24 +57,6 @@
|
||||
Also note that DNS configuration changes may be necessary.
|
||||
when: "lookup('ansible.builtin.varnames', '^matrix_riot_web_.+', wantlist=True) | length > 0"
|
||||
|
||||
- name: (Deprecation) Catch and report renamed element-web settings
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Your configuration contains a variable, which now has a different name.
|
||||
Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
|
||||
when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
|
||||
with_items:
|
||||
- {'old': 'matrix_client_element_showLabsSettings', 'new': 'matrix_client_element_show_lab_settings'}
|
||||
- {'old': 'matrix_client_element_permalinkPrefix', 'new': 'matrix_client_element_permalink_prefix'}
|
||||
- {'old': 'matrix_client_element_roomdir_servers', 'new': 'matrix_client_element_room_directory_servers'}
|
||||
- {'old': 'matrix_client_element_settingDefaults_custom_themes', 'new': 'matrix_client_element_setting_defaults_custom_themes'}
|
||||
- {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
|
||||
- {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
|
||||
- {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
|
||||
- {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
|
||||
- {'old': 'matrix_client_element_welcome_user_id', 'new': '<removed>'}
|
||||
- {'old': 'matrix_client_element_docker_image_name_prefix', 'new': 'matrix_client_element_docker_image_registry_prefix'}
|
||||
|
||||
- when: matrix_client_element_container_labels_traefik_enabled | bool
|
||||
block:
|
||||
- name: Fail if required matrix-client-element Traefik settings not defined
|
||||
|
||||
Reference in New Issue
Block a user