From 635f385971779c3b927edc731c89ce0a543da1af Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 29 Jun 2020 14:53:23 +0300
Subject: [PATCH] Use pre-built arm64 image for ma1sd

ma1sd 2.4.0 announced experimental support for arm64.
We're making use of those arm64 images instead of self-building.
---
 group_vars/matrix_servers            | 12 +++++++++++-
 roles/matrix-ma1sd/defaults/main.yml |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 85dab4dd..155dd8bc 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -564,7 +564,17 @@ matrix_mailer_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
 # If you wish to use the public identity servers (matrix.org, vector.im) instead of your own you may wish to disable this.
 matrix_ma1sd_enabled: true
 
-matrix_ma1sd_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
+# There's no prebuilt ma1sd image for the `arm32` architecture.
+# We're relying on self-building there.
+matrix_ma1sd_architecture: "{{
+	{
+		'amd64': 'amd64',
+		'arm32': 'arm32',
+		'arm64': 'arm64',
+	}[matrix_architecture]
+}}"
+
+matrix_ma1sd_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
 
 # Normally, matrix-nginx-proxy is enabled and nginx can reach ma1sd over the container network.
 # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose
diff --git a/roles/matrix-ma1sd/defaults/main.yml b/roles/matrix-ma1sd/defaults/main.yml
index 9e21d862..822cc942 100644
--- a/roles/matrix-ma1sd/defaults/main.yml
+++ b/roles/matrix-ma1sd/defaults/main.yml
@@ -5,7 +5,9 @@ matrix_ma1sd_enabled: true
 
 matrix_ma1sd_container_image_self_build: false
 
-matrix_ma1sd_docker_image: "ma1uta/ma1sd:2.4.0"
+matrix_ma1sd_architecture: "amd64"
+
+matrix_ma1sd_docker_image: "ma1uta/ma1sd:2.4.0-{{ matrix_ma1sd_architecture }}"
 matrix_ma1sd_docker_image_force_pull: "{{ matrix_ma1sd_docker_image.endswith(':latest') }}"
 
 matrix_ma1sd_base_path: "{{ matrix_base_data_path }}/ma1sd"