From d1154f41ed65dc274dd7485f229537fada8f9d74 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 7 Feb 2026 16:39:53 +0900 Subject: [PATCH] Set `cinny_container_image_*` Signed-off-by: Suguru Hirahara --- group_vars/matrix_servers | 3 ++- roles/custom/matrix-client-cinny/defaults/main.yml | 10 +++++----- .../custom/matrix-client-cinny/tasks/setup_install.yml | 10 +++++----- .../templates/systemd/matrix-client-cinny.service.j2 | 2 +- .../tasks/validate_config.yml | 5 +++++ 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 92eea1141..a24ce4972 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -4290,7 +4290,8 @@ cinny_enabled: false cinny_identifier: matrix-client-cinny -cinny_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else cinny_docker_image_registry_prefix_upstream_default }}" +cinny_container_image_registry_prefix: "{{ 'localhost/' if cinny_container_image_self_build else cinny_container_image_registry_prefix_upstream }}" +cinny_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else cinny_container_image_registry_prefix_upstream_default }}" cinny_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}" diff --git a/roles/custom/matrix-client-cinny/defaults/main.yml b/roles/custom/matrix-client-cinny/defaults/main.yml index be5d14887..c1b2c0094 100644 --- a/roles/custom/matrix-client-cinny/defaults/main.yml +++ b/roles/custom/matrix-client-cinny/defaults/main.yml @@ -18,11 +18,11 @@ cinny_container_image_self_build_repo: "https://github.com/ajbura/cinny.git" # renovate: datasource=docker depName=ajbura/cinny cinny_version: v4.10.2 -cinny_docker_image: "{{ cinny_docker_image_registry_prefix }}ajbura/cinny:{{ cinny_version }}" -cinny_docker_image_registry_prefix: "{{ 'localhost/' if cinny_container_image_self_build else cinny_docker_image_registry_prefix_upstream }}" -cinny_docker_image_registry_prefix_upstream: "{{ cinny_docker_image_registry_prefix_upstream_default }}" -cinny_docker_image_registry_prefix_upstream_default: docker.io/ -cinny_docker_image_force_pull: "{{ cinny_docker_image.endswith(':latest') }}" +cinny_container_image: "{{ cinny_container_image_registry_prefix }}ajbura/cinny:{{ cinny_version }}" +cinny_container_image_registry_prefix: "{{ 'localhost/' if cinny_container_image_self_build else cinny_container_image_registry_prefix_upstream }}" +cinny_container_image_registry_prefix_upstream: "{{ cinny_container_image_registry_prefix_upstream_default }}" +cinny_container_image_registry_prefix_upstream_default: docker.io/ +cinny_container_image_force_pull: "{{ cinny_container_image.endswith(':latest') }}" cinny_data_path: "{{ matrix_base_data_path }}/client-cinny" cinny_docker_src_files_path: "{{ cinny_data_path }}/docker-src" diff --git a/roles/custom/matrix-client-cinny/tasks/setup_install.yml b/roles/custom/matrix-client-cinny/tasks/setup_install.yml index 5972a1bf1..3cdcd42a3 100644 --- a/roles/custom/matrix-client-cinny/tasks/setup_install.yml +++ b/roles/custom/matrix-client-cinny/tasks/setup_install.yml @@ -22,10 +22,10 @@ - name: Ensure Cinny Docker image is pulled community.docker.docker_image: - name: "{{ cinny_docker_image }}" + name: "{{ cinny_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ cinny_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 cinny_docker_image_force_pull }}" + force_source: "{{ cinny_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 cinny_container_image_force_pull }}" when: "not cinny_container_image_self_build | bool" register: result retries: "{{ devture_playbook_help_container_retries_count }}" @@ -36,7 +36,7 @@ ansible.builtin.git: repo: "{{ cinny_container_image_self_build_repo }}" dest: "{{ cinny_docker_src_files_path }}" - version: "{{ cinny_docker_image.split(':')[1] }}" + version: "{{ cinny_container_image.split(':')[1] }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" @@ -64,7 +64,7 @@ - name: Ensure Cinny Docker image is built community.docker.docker_image: - name: "{{ cinny_docker_image }}" + name: "{{ cinny_container_image }}" source: build force_source: "{{ cinny_git_pull_results.changed }}" build: diff --git a/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2 b/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2 index 44fbbfe70..45258da6f 100644 --- a/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2 +++ b/roles/custom/matrix-client-cinny/templates/systemd/matrix-client-cinny.service.j2 @@ -31,7 +31,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in cinny_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ cinny_docker_image }} + {{ cinny_container_image }} {% for network in cinny_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} cinny diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index 067bdce76..668e1ca24 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -73,6 +73,11 @@ - {'old': 'matrix_playbook_reverse_proxy_traefik_middleware_compession_enabled', 'new': 'matrix_playbook_reverse_proxy_traefik_middleware_compression_enabled'} - {'old': 'matrix_playbook_reverse_proxy_traefik_middleware_compession_name', 'new': 'matrix_playbook_reverse_proxy_traefik_middleware_compression_name'} + - {'old': 'cinny_docker_image', 'new': 'cinny_container_image'} + - {'old': 'cinny_docker_image_registry_prefix', 'new': 'cinny_container_image_registry_prefix'} + - {'old': 'cinny_docker_image_registry_prefix_upstream', 'new': 'cinny_container_image_registry_prefix_upstream'} + - {'old': 'cinny_docker_image_registry_prefix_upstream_default', 'new': 'cinny_container_image_registry_prefix_upstream_default'} + - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: msg: |-