From 5b559db1c99655a6477b070fece1d78a25250ca8 Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 12 Feb 2026 21:26:13 +0900 Subject: [PATCH] Set `hydrogen_container_image_*` Signed-off-by: Suguru Hirahara --- group_vars/matrix_servers | 3 ++- .../matrix-client-hydrogen/defaults/main.yml | 10 +++++----- .../tasks/setup_install.yml | 16 ++++++++-------- .../systemd/matrix-client-hydrogen.service.j2 | 2 +- .../tasks/validate_config.yml | 5 +++++ 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index c79d36cd5..20999c77a 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -4132,7 +4132,8 @@ hydrogen_enabled: false hydrogen_identifier: matrix-client-hydrogen -hydrogen_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else hydrogen_docker_image_registry_prefix_upstream_default }}" +hydrogen_container_image_registry_prefix: "{{ 'localhost/' if hydrogen_container_image_self_build else hydrogen_container_image_registry_prefix_upstream }}" +hydrogen_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else hydrogen_container_image_registry_prefix_upstream_default }}" hydrogen_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}" diff --git a/roles/custom/matrix-client-hydrogen/defaults/main.yml b/roles/custom/matrix-client-hydrogen/defaults/main.yml index cc112e309..d797452ea 100644 --- a/roles/custom/matrix-client-hydrogen/defaults/main.yml +++ b/roles/custom/matrix-client-hydrogen/defaults/main.yml @@ -19,11 +19,11 @@ hydrogen_container_image_self_build_repo: "https://github.com/element-hq/hydroge # renovate: datasource=docker depName=ghcr.io/element-hq/hydrogen-web hydrogen_version: v0.5.1 -hydrogen_docker_image: "{{ hydrogen_docker_image_registry_prefix }}element-hq/hydrogen-web:{{ hydrogen_version }}" -hydrogen_docker_image_registry_prefix: "{{ 'localhost/' if hydrogen_container_image_self_build else hydrogen_docker_image_registry_prefix_upstream }}" -hydrogen_docker_image_registry_prefix_upstream: "{{ hydrogen_docker_image_registry_prefix_upstream_default }}" -hydrogen_docker_image_registry_prefix_upstream_default: ghcr.io/ -hydrogen_docker_image_force_pull: "{{ hydrogen_docker_image.endswith(':latest') }}" +hydrogen_container_image: "{{ hydrogen_container_image_registry_prefix }}element-hq/hydrogen-web:{{ hydrogen_version }}" +hydrogen_container_image_registry_prefix: "{{ 'localhost/' if hydrogen_container_image_self_build else hydrogen_container_image_registry_prefix_upstream }}" +hydrogen_container_image_registry_prefix_upstream: "{{ hydrogen_container_image_registry_prefix_upstream_default }}" +hydrogen_container_image_registry_prefix_upstream_default: ghcr.io/ +hydrogen_container_image_force_pull: "{{ hydrogen_container_image.endswith(':latest') }}" hydrogen_data_path: "{{ matrix_base_data_path }}/client-hydrogen" hydrogen_docker_src_files_path: "{{ hydrogen_data_path }}/docker-src" diff --git a/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml b/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml index a54328ff1..a6a3a6e4a 100644 --- a/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml +++ b/roles/custom/matrix-client-hydrogen/tasks/setup_install.yml @@ -29,15 +29,15 @@ ansible.builtin.git: repo: "{{ hydrogen_container_image_self_build_repo }}" dest: "{{ hydrogen_docker_src_files_path }}" - version: "{{ hydrogen_docker_image.split(':')[1] }}" + version: "{{ hydrogen_container_image.split(':')[1] }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" register: hydrogen_git_pull_results - name: Check if Hydrogen Docker image exists - ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ hydrogen_docker_image }}'" - register: hydrogen_docker_image_check_result + ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ hydrogen_container_image }}'" + register: hydrogen_container_image_check_result changed_when: false # Invoking the `docker build` command here, instead of calling the `docker_image` Ansible module, @@ -48,20 +48,20 @@ chdir: "{{ hydrogen_docker_src_files_path }}" cmd: | {{ devture_systemd_docker_base_host_command_docker }} build \ - -t "{{ hydrogen_docker_image }}" \ + -t "{{ hydrogen_container_image }}" \ -f Dockerfile \ . environment: DOCKER_BUILDKIT: 1 changed_when: true - when: "hydrogen_git_pull_results.changed | bool or hydrogen_docker_image_check_result.stdout == ''" + when: "hydrogen_git_pull_results.changed | bool or hydrogen_container_image_check_result.stdout == ''" - name: Ensure Hydrogen Docker image is pulled community.docker.docker_image: - name: "{{ hydrogen_docker_image }}" + name: "{{ hydrogen_container_image }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ hydrogen_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 hydrogen_docker_image_force_pull }}" + force_source: "{{ hydrogen_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 hydrogen_container_image_force_pull }}" when: "not hydrogen_container_image_self_build | bool" register: result retries: "{{ devture_playbook_help_container_retries_count }}" diff --git a/roles/custom/matrix-client-hydrogen/templates/systemd/matrix-client-hydrogen.service.j2 b/roles/custom/matrix-client-hydrogen/templates/systemd/matrix-client-hydrogen.service.j2 index 8c852553f..129bd15cf 100644 --- a/roles/custom/matrix-client-hydrogen/templates/systemd/matrix-client-hydrogen.service.j2 +++ b/roles/custom/matrix-client-hydrogen/templates/systemd/matrix-client-hydrogen.service.j2 @@ -31,7 +31,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in hydrogen_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ hydrogen_docker_image }} + {{ hydrogen_container_image }} {% for network in hydrogen_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} hydrogen diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index f9d1df7cd..b0706c693 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml @@ -90,6 +90,11 @@ - {'old': 'ddclient_docker_image_registry_prefix_upstream', 'new': 'ddclient_container_image_registry_prefix_upstream'} - {'old': 'ddclient_docker_image_registry_prefix_upstream_default', 'new': 'ddclient_container_image_registry_prefix_upstream_default'} + - {'old': 'hydrogen_docker_image', 'new': 'hydrogen_container_image'} + - {'old': 'hydrogen_docker_image_registry_prefix', 'new': 'hydrogen_container_image_registry_prefix'} + - {'old': 'hydrogen_docker_image_registry_prefix_upstream', 'new': 'hydrogen_container_image_registry_prefix_upstream'} + - {'old': 'hydrogen_docker_image_registry_prefix_upstream_default', 'new': 'hydrogen_container_image_registry_prefix_upstream_default'} + - name: (Deprecation) Catch and report matrix_postgres variables ansible.builtin.fail: msg: |-