From 426839c287eab8f6d1d48cc7e96b4f506d8a2b92 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 18 Feb 2026 06:36:18 +0200 Subject: [PATCH] Rename matrix-bot-buscarron _docker_ vars to _container_ Co-Authored-By: Claude Opus 4.6 --- group_vars/matrix_servers | 2 +- .../matrix-bot-buscarron/defaults/main.yml | 16 ++++++++-------- .../tasks/setup_install.yml | 18 +++++++++--------- .../tasks/validate_config.yml | 8 ++++++++ .../systemd/matrix-bot-buscarron.service.j2 | 2 +- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 3f2d389b7..83357d6b4 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -2954,7 +2954,7 @@ matrix_bot_buscarron_systemd_required_services_list_auto: | ([postgres_identifier ~ '.service'] if (postgres_enabled and matrix_bot_buscarron_database_hostname == postgres_connection_hostname) else []) }} -matrix_bot_buscarron_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_bot_buscarron_docker_image_registry_prefix_upstream_default }}" +matrix_bot_buscarron_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_bot_buscarron_container_image_registry_prefix_upstream_default }}" matrix_bot_buscarron_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" diff --git a/roles/custom/matrix-bot-buscarron/defaults/main.yml b/roles/custom/matrix-bot-buscarron/defaults/main.yml index 0586f19c5..3da905392 100644 --- a/roles/custom/matrix-bot-buscarron/defaults/main.yml +++ b/roles/custom/matrix-bot-buscarron/defaults/main.yml @@ -32,15 +32,15 @@ matrix_bot_buscarron_data_path: "{{ matrix_bot_buscarron_base_path }}/data" matrix_bot_buscarron_data_store_path: "{{ matrix_bot_buscarron_data_path }}/store" matrix_bot_buscarron_container_image_self_build: false -matrix_bot_buscarron_docker_repo: "https://github.com/etkecc/buscarron.git" -matrix_bot_buscarron_docker_repo_version: "{{ matrix_bot_buscarron_version }}" -matrix_bot_buscarron_docker_src_files_path: "{{ matrix_base_data_path }}/buscarron/docker-src" +matrix_bot_buscarron_container_repo: "https://github.com/etkecc/buscarron.git" +matrix_bot_buscarron_container_repo_version: "{{ matrix_bot_buscarron_version }}" +matrix_bot_buscarron_container_src_files_path: "{{ matrix_base_data_path }}/buscarron/docker-src" -matrix_bot_buscarron_docker_image: "{{ matrix_bot_buscarron_docker_image_registry_prefix }}etkecc/buscarron:{{ matrix_bot_buscarron_version }}" -matrix_bot_buscarron_docker_image_registry_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else matrix_bot_buscarron_docker_image_registry_prefix_upstream }}" -matrix_bot_buscarron_docker_image_registry_prefix_upstream: "{{ matrix_bot_buscarron_docker_image_registry_prefix_upstream_default }}" -matrix_bot_buscarron_docker_image_registry_prefix_upstream_default: "ghcr.io/" -matrix_bot_buscarron_docker_image_force_pull: "{{ matrix_bot_buscarron_docker_image.endswith(':latest') }}" +matrix_bot_buscarron_container_image: "{{ matrix_bot_buscarron_container_image_registry_prefix }}etkecc/buscarron:{{ matrix_bot_buscarron_version }}" +matrix_bot_buscarron_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else matrix_bot_buscarron_container_image_registry_prefix_upstream }}" +matrix_bot_buscarron_container_image_registry_prefix_upstream: "{{ matrix_bot_buscarron_container_image_registry_prefix_upstream_default }}" +matrix_bot_buscarron_container_image_registry_prefix_upstream_default: "ghcr.io/" +matrix_bot_buscarron_container_image_force_pull: "{{ matrix_bot_buscarron_container_image.endswith(':latest') }}" # The base container network. It will be auto-created by this role if it doesn't exist already. matrix_bot_buscarron_container_network: matrix-bot-buscarron diff --git a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml index 269bbeecc..ea786046b 100644 --- a/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml +++ b/roles/custom/matrix-bot-buscarron/tasks/setup_install.yml @@ -45,7 +45,7 @@ - {path: "{{ matrix_bot_buscarron_config_path }}", when: true} - {path: "{{ matrix_bot_buscarron_data_path }}", when: true} - {path: "{{ matrix_bot_buscarron_data_store_path }}", when: true} - - {path: "{{ matrix_bot_buscarron_docker_src_files_path }}", when: true} + - {path: "{{ matrix_bot_buscarron_container_src_files_path }}", when: true} when: "item.when | bool" - name: Ensure Buscarron support files installed @@ -62,10 +62,10 @@ - name: Ensure Buscarron image is pulled community.docker.docker_image: - name: "{{ matrix_bot_buscarron_docker_image }}" + name: "{{ matrix_bot_buscarron_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_bot_buscarron_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_bot_buscarron_docker_image_force_pull }}" + force_source: "{{ matrix_bot_buscarron_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_bot_buscarron_container_image_force_pull }}" when: "not matrix_bot_buscarron_container_image_self_build | bool" register: matrix_bot_buscarron_container_image_pull_result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -74,9 +74,9 @@ - name: Ensure Buscarron repository is present on self-build ansible.builtin.git: - repo: "{{ matrix_bot_buscarron_docker_repo }}" - version: "{{ matrix_bot_buscarron_docker_repo_version }}" - dest: "{{ matrix_bot_buscarron_docker_src_files_path }}" + repo: "{{ matrix_bot_buscarron_container_repo }}" + version: "{{ matrix_bot_buscarron_container_repo_version }}" + dest: "{{ matrix_bot_buscarron_container_src_files_path }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" @@ -85,13 +85,13 @@ - name: Ensure Buscarron image is built community.docker.docker_image: - name: "{{ matrix_bot_buscarron_docker_image }}" + name: "{{ matrix_bot_buscarron_container_image }}" source: build force_source: "{{ matrix_bot_buscarron_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_bot_buscarron_git_pull_results.changed }}" build: dockerfile: Dockerfile - path: "{{ matrix_bot_buscarron_docker_src_files_path }}" + path: "{{ matrix_bot_buscarron_container_src_files_path }}" pull: true when: "matrix_bot_buscarron_container_image_self_build | bool" diff --git a/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml b/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml index 97b765235..e0a52542c 100644 --- a/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml +++ b/roles/custom/matrix-bot-buscarron/tasks/validate_config.yml @@ -17,6 +17,14 @@ - {'old': 'matrix_bot_buscarron_spam_emails', 'new': ''} - {'old': 'matrix_bot_buscarron_spam_localparts', 'new': ''} - {'old': 'matrix_bot_buscarron_container_image_name_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'} + - {'old': 'matrix_bot_buscarron_docker_image', 'new': 'matrix_bot_buscarron_container_image'} + - {'old': 'matrix_bot_buscarron_docker_image_force_pull', 'new': 'matrix_bot_buscarron_container_image_force_pull'} + - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'} + - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream'} + - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream_default'} + - {'old': 'matrix_bot_buscarron_docker_repo', 'new': 'matrix_bot_buscarron_container_repo'} + - {'old': 'matrix_bot_buscarron_docker_repo_version', 'new': 'matrix_bot_buscarron_container_repo_version'} + - {'old': 'matrix_bot_buscarron_docker_src_files_path', 'new': 'matrix_bot_buscarron_container_src_files_path'} - name: Fail if required Buscarron settings not defined ansible.builtin.fail: diff --git a/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 b/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 index 3593fff97..e108741d8 100644 --- a/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 +++ b/roles/custom/matrix-bot-buscarron/templates/systemd/matrix-bot-buscarron.service.j2 @@ -30,7 +30,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in matrix_bot_buscarron_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ matrix_bot_buscarron_docker_image }} + {{ matrix_bot_buscarron_container_image }} {% for network in matrix_bot_buscarron_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-buscarron