From aa60fdeb008a5e31a47bb07a1a628c080fabb4fd Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Tue, 2 Jan 2024 16:01:16 +0200 Subject: [PATCH] Do not put architecture stuff in matrix_mautrix_signal_version .. because matrix_mautrix_signal_version is used in other places which do not expect it. For example: `matrix_mautrix_signal_container_image_self_build_branch` Related to: https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/3041 --- roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml index 60dd3f5bd..3b2f58e3c 100644 --- a/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-signal/defaults/main.yml @@ -9,10 +9,11 @@ matrix_mautrix_signal_container_image_self_build_repo: "https://mau.dev/mautrix/ matrix_mautrix_signal_container_image_self_build_branch: "{{ 'main' if matrix_mautrix_signal_version == 'latest' else matrix_mautrix_signal_version }}" # renovate: datasource=docker depName=dock.mau.dev/mautrix/signal -matrix_mautrix_signal_version: 18e006300885e7432f0791211dec77345ae974a2-{{ matrix_architecture }} +matrix_mautrix_signal_version: 18e006300885e7432f0791211dec77345ae974a2 # See: https://mau.dev/mautrix/signal/container_registry -matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_version }}" +matrix_mautrix_signal_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}mautrix/signal:{{ matrix_mautrix_signal_docker_image_tag }}" +matrix_mautrix_signal_docker_image_tag: "18e006300885e7432f0791211dec77345ae974a2-{{ matrix_architecture }}" matrix_mautrix_signal_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_signal_container_image_self_build else 'dock.mau.dev/' }}" matrix_mautrix_signal_docker_image_force_pull: "{{ matrix_mautrix_signal_docker_image.endswith(':latest') }}"