Remove the tasks to retrieve a nonexistent container image for Matrix.to

Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>

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 }}"
+# There does not exist a known pre-built container image. It needs to be built locally.
-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') }}"
-
 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"

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
+- name: Ensure Matrix.to repository is present on self-build
-  when: "not matrix_matrixto_container_image_self_build | bool"
+  ansible.builtin.git:
-  block:
+    repo: "{{ matrix_matrixto_container_image_self_build_repo }}"
-    - name: Ensure Matrix.to container image is pulled via community.docker.docker_image
+    version: "{{ matrix_matrixto_container_image_self_build_repo_version }}"
-      when: devture_systemd_docker_base_container_image_pull_method == 'ansible-module'
+    dest: "{{ matrix_matrixto_container_image_self_build_src_files_path }}"
-      community.docker.docker_image:
+    force: "yes"
-        name: "{{ matrix_matrixto_container_image }}"
+  register: matrix_matrixto_git_pull_results
-        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 container image is pulled via ansible.builtin.command
+- name: Ensure Matrix.to container image is built
-      when: devture_systemd_docker_base_container_image_pull_method == 'command'
+  community.docker.docker_image:
-      ansible.builtin.command:
+    name: "{{ matrix_matrixto_container_image_self_build_name }}"
-        cmd: "{{ devture_systemd_docker_base_host_command_docker }} pull {{ matrix_matrixto_container_image }}"
+    source: build
-      register: result
+    force_source: "{{ matrix_matrixto_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-      retries: "{{ devture_playbook_help_container_retries_count }}"
+    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_matrixto_git_pull_results.changed }}"
-      delay: "{{ devture_playbook_help_container_retries_delay }}"
+    build:
-      until: result is not failed
+      dockerfile: Dockerfile
-      changed_when: "'Downloaded newer image' in result.stdout"
+      path: "{{ matrix_matrixto_container_image_self_build_src_files_path }}"
-
+      pull: true
-- name: Run if self-building of Matrix.to container image is enabled
+      args:
-  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 network is created via community.docker.docker_network
   when: devture_systemd_docker_base_container_network_creation_method == 'ansible-module'

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 }}