From 68337b6f4597b244dccc831267984a8be25f822e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Sat, 20 Dec 2025 00:23:24 +0900 Subject: [PATCH] Remove the tasks to retrieve a nonexistent container image for Matrix.to Signed-off-by: Suguru Hirahara --- .../custom/matrix-matrixto/defaults/main.yml | 8 +-- .../custom/matrix-matrixto/tasks/install.yml | 64 ++++++------------- .../systemd/matrix-matrixto.service.j2 | 2 +- 3 files changed, 20 insertions(+), 54 deletions(-) diff --git a/roles/custom/matrix-matrixto/defaults/main.yml b/roles/custom/matrix-matrixto/defaults/main.yml index 702ffdabe..be9762482 100644 --- a/roles/custom/matrix-matrixto/defaults/main.yml +++ b/roles/custom/matrix-matrixto/defaults/main.yml @@ -28,13 +28,7 @@ matrix_matrixto_hostname: "" # technical limitations. matrix_matrixto_path_prefix: / -matrix_matrixto_container_image: "{{ matrix_matrixto_container_image_registry_prefix }}shirahara/matrixto:{{ matrix_matrixto_container_image_tag }}" -matrix_matrixto_container_image_tag: "{{ matrix_matrixto_version }}" -matrix_matrixto_container_image_registry_prefix: "{{ matrix_matrixto_container_image_registry_prefix_upstream }}" -matrix_matrixto_container_image_registry_prefix_upstream: "{{ matrix_matrixto_container_image_registry_prefix_upstream_default }}" -matrix_matrixto_container_image_registry_prefix_upstream_default: "" -matrix_matrixto_container_image_force_pull: "{{ matrix_matrixto_container_image.endswith(':latest') }}" - +# There does not exist a known pre-built container image. It needs to be built locally. matrix_matrixto_container_image_self_build: true matrix_matrixto_container_image_self_build_name: "shirahara/matrixto:{{ matrix_matrixto_container_image_self_build_repo_version }}" matrix_matrixto_container_image_self_build_repo: "https://seed.radicle.garden/z3Re1EQbd186vUQDwHByYiLadsVWY.git" diff --git a/roles/custom/matrix-matrixto/tasks/install.yml b/roles/custom/matrix-matrixto/tasks/install.yml index 51a316c43..e4cc0f4f5 100644 --- a/roles/custom/matrix-matrixto/tasks/install.yml +++ b/roles/custom/matrix-matrixto/tasks/install.yml @@ -25,53 +25,25 @@ - env - labels -- name: Run if self-building of Matrix.to container image is not enabled - when: "not matrix_matrixto_container_image_self_build | bool" - block: - - name: Ensure Matrix.to container image is pulled via community.docker.docker_image - when: devture_systemd_docker_base_container_image_pull_method == 'ansible-module' - community.docker.docker_image: - name: "{{ matrix_matrixto_container_image }}" - source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" - force_source: "{{ matrix_matrixto_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_matrixto_container_image_force_pull }}" - register: result - retries: "{{ devture_playbook_help_container_retries_count }}" - delay: "{{ devture_playbook_help_container_retries_delay }}" - until: result is not failed +- name: Ensure Matrix.to repository is present on self-build + ansible.builtin.git: + repo: "{{ matrix_matrixto_container_image_self_build_repo }}" + version: "{{ matrix_matrixto_container_image_self_build_repo_version }}" + dest: "{{ matrix_matrixto_container_image_self_build_src_files_path }}" + force: "yes" + register: matrix_matrixto_git_pull_results - - name: Ensure Matrix.to container image is pulled via ansible.builtin.command - when: devture_systemd_docker_base_container_image_pull_method == 'command' - ansible.builtin.command: - cmd: "{{ devture_systemd_docker_base_host_command_docker }} pull {{ matrix_matrixto_container_image }}" - register: result - retries: "{{ devture_playbook_help_container_retries_count }}" - delay: "{{ devture_playbook_help_container_retries_delay }}" - until: result is not failed - changed_when: "'Downloaded newer image' in result.stdout" - -- name: Run if self-building of Matrix.to container image is enabled - when: "matrix_matrixto_container_image_self_build | bool" - block: - - name: Ensure Matrix.to repository is present on self-build - ansible.builtin.git: - repo: "{{ matrix_matrixto_container_image_self_build_repo }}" - version: "{{ matrix_matrixto_container_image_self_build_repo_version }}" - dest: "{{ matrix_matrixto_container_image_self_build_src_files_path }}" - force: "yes" - register: matrix_matrixto_git_pull_results - - - name: Ensure Matrix.to container image is built - community.docker.docker_image: - name: "{{ matrix_matrixto_container_image_self_build_name }}" - source: build - force_source: "{{ matrix_matrixto_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_matrixto_git_pull_results.changed }}" - build: - dockerfile: Dockerfile - path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}" - pull: true - args: +- name: Ensure Matrix.to container image is built + community.docker.docker_image: + name: "{{ matrix_matrixto_container_image_self_build_name }}" + source: build + force_source: "{{ matrix_matrixto_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_matrixto_git_pull_results.changed }}" + build: + dockerfile: Dockerfile + path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}" + pull: true + args: - name: Ensure Matrix.to container network is created via community.docker.docker_network when: devture_systemd_docker_base_container_network_creation_method == 'ansible-module' diff --git a/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 b/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 index 920f423a5..4d02857a5 100644 --- a/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 +++ b/roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2 @@ -40,7 +40,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \ {% for arg in matrix_matrixto_container_extra_arguments %} {{ arg }} \ {% endfor %} - {{ matrix_matrixto_container_image_self_build_name if matrix_matrixto_container_image_self_build else matrix_matrixto_container_image }} + {{ matrix_matrixto_container_image_self_build_name }} {% for network in matrix_matrixto_container_additional_networks %} ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_matrixto_identifier }}