iartamonov/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-12-21 15:37:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Suguru Hirahara <did:key:z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>
This commit is contained in:
Suguru Hirahara
2025-12-20 00:23:24 +09:00
committed by Slavi Pantaleev
parent a8ef76735d
commit 68337b6f45
3 changed files with 20 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/custom/matrix-matrixto/defaults/main.yml
View File

@@ -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"

32
roles/custom/matrix-matrixto/tasks/install.yml
View File

@@ -25,35 +25,7 @@
- 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 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
- 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 }}"
@@ -61,7 +33,7 @@
force: "yes"
register: matrix_matrixto_git_pull_results
- name: Ensure Matrix.to container image is built
- name: Ensure Matrix.to container image is built
community.docker.docker_image:
name: "{{ matrix_matrixto_container_image_self_build_name }}"
source: build

2
roles/custom/matrix-matrixto/templates/systemd/matrix-matrixto.service.j2
View File

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