From 669490f18ec7116e001b5b0bde82bf116b9b9e95 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 18 Feb 2026 05:43:07 +0200 Subject: [PATCH] Refactor Continuwuity role: add version variable and rename docker to container Add matrix_continuwuity_version with container_image_tag inheriting from it. Rename all _docker_image* variables to _container_image* with deprecation notices. Co-Authored-By: Claude Opus 4.6 --- group_vars/matrix_servers | 2 +- roles/custom/matrix-continuwuity/defaults/main.yml | 14 ++++++++------ roles/custom/matrix-continuwuity/tasks/install.yml | 6 +++--- .../matrix-continuwuity/tasks/setup_install.yml | 6 +++--- .../matrix-continuwuity/tasks/validate_config.yml | 6 ++++++ .../systemd/matrix-continuwuity.service.j2 | 2 +- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index d6b6616a1..a936b17b4 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -5677,7 +5677,7 @@ matrix_continuwuity_hostname: "{{ matrix_server_fqn_matrix }}" matrix_continuwuity_config_allow_federation: "{{ matrix_homeserver_federation_enabled }}" -matrix_continuwuity_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_continuwuity_docker_image_registry_prefix_upstream_default }}" +matrix_continuwuity_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_continuwuity_container_image_registry_prefix_upstream_default }}" matrix_continuwuity_container_network: "{{ matrix_homeserver_container_network }}" diff --git a/roles/custom/matrix-continuwuity/defaults/main.yml b/roles/custom/matrix-continuwuity/defaults/main.yml index b9c124928..ec557bf29 100644 --- a/roles/custom/matrix-continuwuity/defaults/main.yml +++ b/roles/custom/matrix-continuwuity/defaults/main.yml @@ -12,13 +12,15 @@ matrix_continuwuity_enabled: true matrix_continuwuity_hostname: '' -matrix_continuwuity_docker_image: "{{ matrix_continuwuity_docker_image_registry_prefix }}/continuwuation/continuwuity:{{ matrix_continuwuity_docker_image_tag }}" # renovate: datasource=docker depName=forgejo.ellis.link/continuwuation/-/packages/container/continuwuity/ -matrix_continuwuity_docker_image_tag: main -matrix_continuwuity_docker_image_force_pull: "{{ matrix_continuwuity_docker_image.endswith(':latest') }}" -matrix_continuwuity_docker_image_registry_prefix: "{{ matrix_continuwuity_docker_image_registry_prefix_upstream }}" -matrix_continuwuity_docker_image_registry_prefix_upstream: "{{ matrix_continuwuity_docker_image_registry_prefix_upstream_default }}" -matrix_continuwuity_docker_image_registry_prefix_upstream_default: forgejo.ellis.link +matrix_continuwuity_version: main + +matrix_continuwuity_container_image: "{{ matrix_continuwuity_container_image_registry_prefix }}/continuwuation/continuwuity:{{ matrix_continuwuity_container_image_tag }}" +matrix_continuwuity_container_image_tag: "{{ matrix_continuwuity_version }}" +matrix_continuwuity_container_image_force_pull: "{{ matrix_continuwuity_container_image.endswith(':latest') }}" +matrix_continuwuity_container_image_registry_prefix: "{{ matrix_continuwuity_container_image_registry_prefix_upstream }}" +matrix_continuwuity_container_image_registry_prefix_upstream: "{{ matrix_continuwuity_container_image_registry_prefix_upstream_default }}" +matrix_continuwuity_container_image_registry_prefix_upstream_default: forgejo.ellis.link matrix_continuwuity_base_path: "{{ matrix_base_data_path }}/continuwuity" matrix_continuwuity_config_path: "{{ matrix_continuwuity_base_path }}/config" diff --git a/roles/custom/matrix-continuwuity/tasks/install.yml b/roles/custom/matrix-continuwuity/tasks/install.yml index 7d02d2710..8cebf3203 100644 --- a/roles/custom/matrix-continuwuity/tasks/install.yml +++ b/roles/custom/matrix-continuwuity/tasks/install.yml @@ -48,10 +48,10 @@ - name: Ensure continuwuity container image is pulled community.docker.docker_image: - name: "{{ matrix_continuwuity_docker_image }}" + name: "{{ matrix_continuwuity_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_continuwuity_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_continuwuity_docker_image_force_pull }}" + force_source: "{{ matrix_continuwuity_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_continuwuity_container_image_force_pull }}" register: result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" diff --git a/roles/custom/matrix-continuwuity/tasks/setup_install.yml b/roles/custom/matrix-continuwuity/tasks/setup_install.yml index e06cee42e..500f3196e 100644 --- a/roles/custom/matrix-continuwuity/tasks/setup_install.yml +++ b/roles/custom/matrix-continuwuity/tasks/setup_install.yml @@ -47,10 +47,10 @@ - name: Ensure continuwuity container image is pulled community.docker.docker_image: - name: "{{ matrix_continuwuity_docker_image }}" + name: "{{ matrix_continuwuity_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_continuwuity_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_continuwuity_docker_image_force_pull }}" + force_source: "{{ matrix_continuwuity_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_continuwuity_container_image_force_pull }}" register: result retries: "{{ devture_playbook_help_container_retries_count }}" delay: "{{ devture_playbook_help_container_retries_delay }}" diff --git a/roles/custom/matrix-continuwuity/tasks/validate_config.yml b/roles/custom/matrix-continuwuity/tasks/validate_config.yml index dd84f682a..139fbb03e 100644 --- a/roles/custom/matrix-continuwuity/tasks/validate_config.yml +++ b/roles/custom/matrix-continuwuity/tasks/validate_config.yml @@ -28,3 +28,9 @@ - {'old': 'matrix_continuwuity_prevent_media_downloads_from', 'new': 'matrix_continuwuity_config_prevent_media_downloads_from'} - {'old': 'matrix_continuwuity_trusted_servers', 'new': 'matrix_continuwuity_config_trusted_servers'} - {'old': 'matrix_continuwuity_url_preview_domain_contains_allowlist', 'new': 'matrix_continuwuity_config_url_preview_domain_contains_allowlist'} + - {'old': 'matrix_continuwuity_docker_image', 'new': 'matrix_continuwuity_container_image'} + - {'old': 'matrix_continuwuity_docker_image_tag', 'new': 'matrix_continuwuity_container_image_tag'} + - {'old': 'matrix_continuwuity_docker_image_force_pull', 'new': 'matrix_continuwuity_container_image_force_pull'} + - {'old': 'matrix_continuwuity_docker_image_registry_prefix', 'new': 'matrix_continuwuity_container_image_registry_prefix'} + - {'old': 'matrix_continuwuity_docker_image_registry_prefix_upstream', 'new': 'matrix_continuwuity_container_image_registry_prefix_upstream'} + - {'old': 'matrix_continuwuity_docker_image_registry_prefix_upstream_default', 'new': 'matrix_continuwuity_container_image_registry_prefix_upstream_default'} diff --git a/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 b/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 index f46b64c74..155861fdc 100644 --- a/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 +++ b/roles/custom/matrix-continuwuity/templates/systemd/matrix-continuwuity.service.j2 @@ -29,7 +29,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in matrix_continuwuity_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ matrix_continuwuity_docker_image }} + {{ matrix_continuwuity_container_image }} {% for network in matrix_continuwuity_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-continuwuity