From e8047bcb267c1bd60633ed1847e07e486ac29af0 Mon Sep 17 00:00:00 2001
From: Hackintosh 5 <git@hack5.dev>
Date: Wed, 7 Apr 2021 11:04:37 +0100
Subject: [PATCH] Fix self-building defaults and add self-building support for
 some services

---
 group_vars/matrix_servers                     |  7 ++-
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../tasks/setup_install.yml                   | 15 +++----
 .../defaults/main.yml                         | 10 ++++-
 .../tasks/setup_install.yml                   | 44 ++++++++++++++++++-
 .../defaults/main.yml                         |  5 ++-
 .../tasks/setup_install.yml                   | 31 ++++++++++---
 .../defaults/main.yml                         |  6 ++-
 .../tasks/setup_install.yml                   | 20 +++++++++
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 .../defaults/main.yml                         |  1 -
 roles/matrix-client-element/defaults/main.yml |  1 -
 roles/matrix-corporal/defaults/main.yml       |  1 -
 roles/matrix-coturn/defaults/main.yml         |  1 -
 roles/matrix-dynamic-dns/defaults/main.yml    |  1 -
 roles/matrix-ma1sd/defaults/main.yml          |  1 -
 roles/matrix-mailer/defaults/main.yml         |  1 -
 roles/matrix-postgres/defaults/main.yml       |  1 -
 roles/matrix-registration/defaults/main.yml   |  1 -
 .../tasks/setup_install.yml                   | 10 ++---
 roles/matrix-synapse-admin/defaults/main.yml  |  1 -
 roles/matrix-synapse/defaults/main.yml        |  1 -
 31 files changed, 119 insertions(+), 51 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 96b933f35..4a3bfd486 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -348,6 +348,8 @@ matrix_mautrix_instagram_database_password: "{{ matrix_synapse_macaroon_secret_k
 # We don't enable bridges by default.
 matrix_mautrix_signal_enabled: false
 
+matrix_mautrix_signal_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
+
 matrix_mautrix_signal_systemd_required_services_list: |
   {{
     ['docker.service']
@@ -433,6 +435,8 @@ matrix_mautrix_telegram_database_password: "{{ matrix_synapse_macaroon_secret_ke
 # We don't enable bridges by default.
 matrix_mautrix_whatsapp_enabled: false
 
+matrix_mautrix_whatsapp_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
+
 matrix_mautrix_whatsapp_systemd_required_services_list: |
   {{
     ['docker.service']
@@ -1013,6 +1017,7 @@ matrix_etherpad_database_password: "{{ matrix_synapse_macaroon_secret_key | pass
 ######################################################################
 
 matrix_dynamic_dns_enabled: false
+matrix_dynamic_dns_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
 
 ######################################################################
 #
@@ -1325,7 +1330,7 @@ matrix_postgres_architecture: "{{ matrix_architecture }}"
 # and tell users they need to set it (either here or in those variables).
 matrix_postgres_connection_hostname: "{{ 'matrix-postgres' if matrix_postgres_enabled else '' }}"
 
-matrix_postgres_pgloader_container_image_self_build: "{{ matrix_architecture != 'amd64' }}"
+matrix_postgres_pgloader_container_image_self_build: false
 
 matrix_postgres_additional_databases: |
   {{
diff --git a/roles/matrix-bridge-appservice-irc/defaults/main.yml b/roles/matrix-bridge-appservice-irc/defaults/main.yml
index ca8797b4f..ca4e82927 100644
--- a/roles/matrix-bridge-appservice-irc/defaults/main.yml
+++ b/roles/matrix-bridge-appservice-irc/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_appservice_irc_enabled: true
 
-matrix_appservice_irc_container_self_build: false
 matrix_appservice_irc_docker_repo: "https://github.com/matrix-org/matrix-appservice-irc.git"
 matrix_appservice_irc_docker_src_files_path: "{{ matrix_base_data_path }}/appservice-irc/docker-src"
 
diff --git a/roles/matrix-bridge-appservice-slack/defaults/main.yml b/roles/matrix-bridge-appservice-slack/defaults/main.yml
index bb801273f..9ad24f3ca 100644
--- a/roles/matrix-bridge-appservice-slack/defaults/main.yml
+++ b/roles/matrix-bridge-appservice-slack/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_appservice_slack_enabled: true
 
-matrix_appservice_slack_container_self_build: false
 matrix_appservice_slack_docker_repo: "https://github.com/matrix-org/matrix-appservice-slack.git"
 matrix_appservice_slack_docker_src_files_path: "{{ matrix_base_data_path }}/appservice-slack/docker-src"
 
diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index 71a225f7c..3ebec2559 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mautrix_facebook_enabled: true
 
-matrix_mautrix_facebook_container_image_self_build: false
 matrix_mautrix_facebook_container_image_self_build_repo: "https://github.com/tulir/mautrix-facebook.git"
 
 matrix_mautrix_facebook_version: latest
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index 48b66b8d6..8e3fca2b4 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mautrix_hangouts_enabled: true
 
-matrix_mautrix_hangouts_container_image_self_build: false
 matrix_mautrix_hangouts_container_image_self_build_repo: "https://github.com/tulir/mautrix-hangouts.git"
 
 matrix_mautrix_hangouts_version: latest
diff --git a/roles/matrix-bridge-mautrix-instagram/defaults/main.yml b/roles/matrix-bridge-mautrix-instagram/defaults/main.yml
index 5204386d5..f9d4196b7 100644
--- a/roles/matrix-bridge-mautrix-instagram/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-instagram/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mautrix_instagram_enabled: true
 
-matrix_mautrix_instagram_container_image_self_build: false
 matrix_mautrix_instagram_container_image_self_build_repo: "https://github.com/tulir/mautrix-instagram.git"
 
 matrix_mautrix_instagram_version: latest
diff --git a/roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml
index 604742309..74129de37 100644
--- a/roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-instagram/tasks/setup_install.yml
@@ -17,20 +17,15 @@
 
 - name: Ensure Mautrix instagram paths exist
   file:
-    path: "{{ item.path }}"
+    path: "{{ item }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_mautrix_instagram_base_path }}", when: true }
-    - { path: "{{ matrix_mautrix_instagram_config_path }}", when: true }
-    - { path: "{{ matrix_mautrix_instagram_data_path }}", when: true }
-    - {
-        path: "{{ matrix_mautrix_instagram_docker_src_files_path }}",
-        when: "{{ matrix_mautrix_instagram_container_image_self_build }}",
-      }
-  when: item.when|bool
+    - "{{ matrix_mautrix_instagram_base_path }}"
+    - "{{ matrix_mautrix_instagram_config_path }}"
+    - "{{ matrix_mautrix_instagram_data_path }}"
 
 - name: Ensure Mautrix instagram repository is present on self-build
   git:
@@ -50,6 +45,8 @@
       dockerfile: Dockerfile
       path: "{{ matrix_mautrix_instagram_docker_src_files_path }}"
       pull: yes
+      args:
+        TARGETARCH: "{{ matrix_architecture }}"
   when: "matrix_mautrix_instagram_enabled|bool and matrix_mautrix_instagram_container_image_self_build|bool"
 
 - name: Ensure mautrix-instagram config.yaml installed
diff --git a/roles/matrix-bridge-mautrix-signal/defaults/main.yml b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
index 29b6f780a..e51c31288 100644
--- a/roles/matrix-bridge-mautrix-signal/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-signal/defaults/main.yml
@@ -3,18 +3,24 @@
 
 matrix_mautrix_signal_enabled: true
 
+matrix_mautrix_signal_container_image_self_build_repo: "https://github.com/tulir/mautrix-signal.git"
+matrix_mautrix_signal_daemon_container_image_self_build_repo: "https://mau.dev/maunium/signald.git"
+
 matrix_mautrix_signal_version: latest
 matrix_mautrix_signal_daemon_version: latest
 # See: https://mau.dev/tulir/mautrix-signal/container_registry
-matrix_mautrix_signal_docker_image: "dock.mau.dev/tulir/mautrix-signal:{{ matrix_mautrix_signal_version }}"
+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: "{{ matrix_mautrix_signal_docker_image_name_prefix }}tulir/mautrix-signal:{{ matrix_mautrix_signal_version }}"
 matrix_mautrix_signal_docker_image_force_pull: "{{ matrix_mautrix_signal_docker_image.endswith(':latest') }}"
 
-matrix_mautrix_signal_daemon_docker_image: "dock.mau.dev/maunium/signald:{{ matrix_mautrix_signal_daemon_version }}"
+matrix_mautrix_signal_daemon_docker_image: "{{ matrix_mautrix_signal_docker_image_name_prefix }}maunium/signald:{{ matrix_mautrix_signal_daemon_version }}"
 matrix_mautrix_signal_daemon_docker_image_force_pull: "{{ matrix_mautrix_signal_daemon_docker_image.endswith(':latest') }}"
 
 matrix_mautrix_signal_base_path: "{{ matrix_base_data_path }}/mautrix-signal"
 matrix_mautrix_signal_config_path: "{{ matrix_mautrix_signal_base_path }}/bridge"
 matrix_mautrix_signal_daemon_path: "{{ matrix_mautrix_signal_base_path }}/signald"
+matrix_mautrix_signal_docker_src_files_path: "{{matrix_mautrix_signal_base_path }}/docker-src"
+matrix_mautrix_signal_daemon_docker_src_files_path: "{{matrix_mautrix_signal_base_path }}/daemon-docker-src"
 
 matrix_mautrix_signal_homeserver_address: ''
 matrix_mautrix_signal_homeserver_domain: ''
diff --git a/roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml
index 61c6adff8..65820a77a 100644
--- a/roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-signal/tasks/setup_install.yml
@@ -14,7 +14,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_signal_docker_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_mautrix_signal_docker_image_force_pull }}"
-  when: matrix_mautrix_signal_enabled|bool
+  when: matrix_mautrix_signal_enabled|bool and not matrix_mautrix_signal_container_image_self_build
 
 - name: Ensure Mautrix Signal Daemon image is pulled
   docker_image:
@@ -22,7 +22,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_signal_daemon_docker_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_mautrix_signal_daemon_docker_image_force_pull }}"
-  when: matrix_mautrix_signal_enabled|bool
+  when: matrix_mautrix_signal_enabled|bool and not matrix_mautrix_signal_container_image_self_build
 
 - name: Ensure Mautrix Signal paths exist
   file:
@@ -39,6 +39,46 @@
     - "{{ matrix_mautrix_signal_daemon_path }}/attachments"
     - "{{ matrix_mautrix_signal_daemon_path }}/data"
 
+- name: Ensure Mautrix signal repository is present on self-build
+  git:
+    repo: "{{ matrix_mautrix_signal_container_image_self_build_repo }}"
+    dest: "{{ matrix_mautrix_signal_docker_src_files_path }}"
+    force: "yes"
+  register: matrix_mautrix_signal_git_pull_results
+  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_image_self_build"
+
+- name: Ensure Mautrix signal Docker image is built
+  docker_image:
+    name: "{{ matrix_mautrix_signal_docker_image }}"
+    source: build
+    force_source: "{{ matrix_mautrix_signal_git_pull_results.changed }}"
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_mautrix_signal_docker_src_files_path }}"
+      pull: yes
+      args:
+        TARGETARCH: "{{ matrix_architecture }}"
+  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_image_self_build|bool"
+
+- name: Ensure Mautrix signal_daemon repository is present on self-build
+  git:
+    repo: "{{ matrix_mautrix_signal_daemon_container_image_self_build_repo }}"
+    dest: "{{ matrix_mautrix_signal_daemon_docker_src_files_path }}"
+    force: "yes"
+  register: matrix_mautrix_signal_daemon_git_pull_results
+  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_image_self_build"
+
+- name: Ensure Mautrix signal_daemon Docker image is built
+  docker_image:
+    name: "{{ matrix_mautrix_signal_daemon_docker_image }}"
+    source: build
+    force_source: "{{ matrix_mautrix_signal_daemon_git_pull_results.changed }}"
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_mautrix_signal_daemon_docker_src_files_path }}"
+      pull: yes
+  when: "matrix_mautrix_signal_enabled|bool and matrix_mautrix_signal_container_image_self_build|bool"
+
 - name: Ensure mautrix-signal config.yaml installed
   copy:
     content: "{{ matrix_mautrix_signal_configuration|to_nice_yaml }}"
diff --git a/roles/matrix-bridge-mautrix-telegram/defaults/main.yml b/roles/matrix-bridge-mautrix-telegram/defaults/main.yml
index e4c7696aa..4369fd011 100644
--- a/roles/matrix-bridge-mautrix-telegram/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-telegram/defaults/main.yml
@@ -3,13 +3,16 @@
 
 matrix_mautrix_telegram_enabled: true
 
-matrix_mautrix_telegram_container_self_build: false
 matrix_mautrix_telegram_docker_repo: "https://mau.dev/tulir/mautrix-telegram.git"
+matrix_mautrix_telegram_lottieconverter_docker_repo: "https://mau.dev/tulir/lottieconverter.git"
 matrix_mautrix_telegram_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/docker-src"
+matrix_mautrix_telegram_lottieconverter_docker_src_files_path: "{{ matrix_base_data_path }}/mautrix-telegram/lottieconverter-docker-src"
 
 matrix_mautrix_telegram_version: v0.9.0
 # See: https://mau.dev/tulir/mautrix-telegram/container_registry
 matrix_mautrix_telegram_docker_image: "dock.mau.dev/tulir/mautrix-telegram:{{ matrix_mautrix_telegram_version }}"
+# See: https://github.com/tulir/mautrix-telegram/blob/master/Dockerfile#L1
+matrix_mautrix_telegram_lottieconverter_docker_image: "dock.mau.dev/tulir/lottieconverter:alpine-3.13"
 matrix_mautrix_telegram_docker_image_force_pull: "{{ matrix_mautrix_telegram_docker_image.endswith(':latest') }}"
 
 matrix_mautrix_telegram_base_path: "{{ matrix_base_data_path }}/mautrix-telegram"
diff --git a/roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
index 704f0e262..f71a1b737 100644
--- a/roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-telegram/tasks/setup_install.yml
@@ -36,17 +36,15 @@
 
 - name: Ensure Mautrix Telegram paths exist
   file:
-    path: "{{ item.path }}"
+    path: "{{ item }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_mautrix_telegram_base_path }}", when: true }
-    - { path: "{{ matrix_mautrix_telegram_config_path }}", when: true }
-    - { path: "{{ matrix_mautrix_telegram_data_path }}", when: true }
-    - { path: "{{ matrix_mautrix_telegram_docker_src_files_path }}", when: "{{ matrix_mautrix_telegram_container_self_build }}" }
-  when: item.when|bool
+    - "{{ matrix_mautrix_telegram_base_path }}"
+    - "{{ matrix_mautrix_telegram_config_path }}"
+    - "{{ matrix_mautrix_telegram_data_path }}"
 
 - name: Ensure Mautrix Telegram image is pulled
   docker_image:
@@ -56,6 +54,25 @@
     force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_mautrix_telegram_docker_image_force_pull }}"
   when: "not matrix_mautrix_telegram_container_self_build|bool"
 
+- name: Ensure lottieconverter repository is present when self-building
+  git:
+    repo: "{{ matrix_mautrix_telegram_lottieconverter_docker_repo }}"
+    dest: "{{ matrix_mautrix_telegram_lottieconverter_docker_src_files_path }}"
+    force: "yes"
+  register: matrix_mautrix_telegram_lottieconverter_git_pull_results
+  when: "matrix_mautrix_telegram_container_self_build|bool"
+
+- name: Ensure lottieconverter Docker image is build
+  docker_image:
+    name: "{{ matrix_mautrix_telegram_lottieconverter_docker_image }}"
+    source: build
+    force_source: yes
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_mautrix_telegram_lottieconverter_docker_src_files_path }}"
+      pull: yes
+  when: "matrix_mautrix_telegram_container_self_build|bool and matrix_mautrix_telegram_lottieconverter_git_pull_results.changed"
+
 - name: Ensure matrix-mautrix-telegram repository is present when self-building
   git:
     repo: "{{ matrix_mautrix_telegram_docker_repo }}"
@@ -73,7 +90,7 @@
     build:
       dockerfile: Dockerfile
       path: "{{ matrix_mautrix_telegram_docker_src_files_path }}"
-      pull: yes
+      pull: no
   when: "matrix_mautrix_telegram_container_self_build|bool and matrix_mautrix_telegram_git_pull_results.changed"
 
 - name: Check if an old database file already exists
diff --git a/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml b/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml
index f8ae7d873..71c56fc98 100644
--- a/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-whatsapp/defaults/main.yml
@@ -3,14 +3,18 @@
 
 matrix_mautrix_whatsapp_enabled: true
 
+matrix_mautrix_whatsapp_container_image_self_build_repo: "https://github.com/tulir/mautrix-whatsapp.git"
+
 matrix_mautrix_whatsapp_version: latest
 # See: https://mau.dev/tulir/mautrix-whatsapp/container_registry
-matrix_mautrix_whatsapp_docker_image: "dock.mau.dev/tulir/mautrix-whatsapp:{{ matrix_mautrix_whatsapp_version }}"
+matrix_mautrix_whatsapp_docker_image: "{{ matrix_mautrix_whatsapp_docker_image_name_prefix }}tulir/mautrix-whatsapp:{{ matrix_mautrix_whatsapp_version }}"
+matrix_mautrix_whatsapp_docker_image_name_prefix: "{{ 'localhost/' if matrix_mautrix_whatsapp_container_image_self_build else 'dock.mau.dev/' }}"
 matrix_mautrix_whatsapp_docker_image_force_pull: "{{ matrix_mautrix_whatsapp_docker_image.endswith(':latest') }}"
 
 matrix_mautrix_whatsapp_base_path: "{{ matrix_base_data_path }}/mautrix-whatsapp"
 matrix_mautrix_whatsapp_config_path: "{{ matrix_mautrix_whatsapp_base_path }}/config"
 matrix_mautrix_whatsapp_data_path: "{{ matrix_mautrix_whatsapp_base_path }}/data"
+matrix_mautrix_whatsapp_docker_src_files_path: "{{ matrix_mautrix_whatsapp_base_path }}/docker-src"
 
 matrix_mautrix_whatsapp_homeserver_address: "{{ matrix_homeserver_container_url }}"
 matrix_mautrix_whatsapp_homeserver_domain: "{{ matrix_domain }}"
diff --git a/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
index 9691a58f9..a525ea921 100644
--- a/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-whatsapp/tasks/setup_install.yml
@@ -41,6 +41,7 @@
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_mautrix_whatsapp_docker_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_mautrix_whatsapp_docker_image_force_pull }}"
+  when: "matrix_mautrix_whatsapp_enabled|bool and not matrix_mautrix_whatsapp_container_image_self_build"
 
 - name: Ensure Mautrix Whatsapp paths exists
   file:
@@ -54,6 +55,25 @@
     - "{{ matrix_mautrix_whatsapp_config_path }}"
     - "{{ matrix_mautrix_whatsapp_data_path }}"
 
+- name: Ensure Mautrix whatsapp repository is present on self-build
+  git:
+    repo: "{{ matrix_mautrix_whatsapp_container_image_self_build_repo }}"
+    dest: "{{ matrix_mautrix_whatsapp_docker_src_files_path }}"
+    force: "yes"
+  register: matrix_mautrix_whatsapp_git_pull_results
+  when: "matrix_mautrix_whatsapp_enabled|bool and matrix_mautrix_whatsapp_container_image_self_build"
+
+- name: Ensure Mautrix whatsapp Docker image is built
+  docker_image:
+    name: "{{ matrix_mautrix_whatsapp_docker_image }}"
+    source: build
+    force_source: "{{ matrix_mautrix_whatsapp_git_pull_results.changed }}"
+    build:
+      dockerfile: Dockerfile
+      path: "{{ matrix_mautrix_whatsapp_docker_src_files_path }}"
+      pull: yes
+  when: "matrix_mautrix_whatsapp_enabled|bool and matrix_mautrix_whatsapp_container_image_self_build|bool"
+
 - name: Check if an old database file exists
   stat:
     path: "{{ matrix_mautrix_whatsapp_base_path }}/mautrix-whatsapp.db"
diff --git a/roles/matrix-bridge-mx-puppet-discord/defaults/main.yml b/roles/matrix-bridge-mx-puppet-discord/defaults/main.yml
index 7e99c9b2e..a500ee11f 100644
--- a/roles/matrix-bridge-mx-puppet-discord/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-discord/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_discord_enabled: true
 
-matrix_mx_puppet_discord_container_image_self_build: false
 matrix_mx_puppet_discord_container_image_self_build_repo: "https://github.com/matrix-discord/mx-puppet-discord.git"
 
 # Controls whether the mx-puppet-discord container exposes its HTTP port (tcp/8432 in the container).
diff --git a/roles/matrix-bridge-mx-puppet-groupme/defaults/main.yml b/roles/matrix-bridge-mx-puppet-groupme/defaults/main.yml
index 898768bf9..1c07f2158 100644
--- a/roles/matrix-bridge-mx-puppet-groupme/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-groupme/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_groupme_enabled: true
 
-matrix_mx_puppet_groupme_container_image_self_build: false
 matrix_mx_puppet_groupme_container_image_self_build_repo: "https://gitlab.com/robintown/mx-puppet-groupme"
 
 # Controls whether the mx-puppet-groupme container exposes its HTTP port (tcp/8437 in the container).
diff --git a/roles/matrix-bridge-mx-puppet-instagram/defaults/main.yml b/roles/matrix-bridge-mx-puppet-instagram/defaults/main.yml
index 272103604..cf268f31a 100644
--- a/roles/matrix-bridge-mx-puppet-instagram/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-instagram/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_instagram_enabled: true
 
-matrix_mx_puppet_instagram_container_image_self_build: false
 matrix_mx_puppet_instagram_container_image_self_build_repo: "https://github.com/Sorunome/mx-puppet-instagram.git"
 
 matrix_mx_puppet_instagram_version: latest
diff --git a/roles/matrix-bridge-mx-puppet-skype/defaults/main.yml b/roles/matrix-bridge-mx-puppet-skype/defaults/main.yml
index 8dcb2faff..eadb25bb1 100644
--- a/roles/matrix-bridge-mx-puppet-skype/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-skype/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_skype_enabled: true
 
-matrix_mx_puppet_skype_container_image_self_build: false
 matrix_mx_puppet_skype_container_image_self_build_repo: "https://github.com/Sorunome/mx-puppet-skype.git"
 
 matrix_mx_puppet_skype_version: latest
diff --git a/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml b/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
index 65b295c94..d2488c35b 100644
--- a/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-slack/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_slack_enabled: true
 
-matrix_mx_puppet_slack_container_image_self_build: false
 matrix_mx_puppet_slack_container_image_self_build_repo: "https://github.com/Sorunome/mx-puppet-slack.git"
 
 # Controls whether the mx-puppet-slack container exposes its HTTP port (tcp/8432 in the container).
diff --git a/roles/matrix-bridge-mx-puppet-steam/defaults/main.yml b/roles/matrix-bridge-mx-puppet-steam/defaults/main.yml
index e4df90a56..a28072914 100644
--- a/roles/matrix-bridge-mx-puppet-steam/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-steam/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_steam_enabled: true
 
-matrix_mx_puppet_steam_container_image_self_build: false
 matrix_mx_puppet_steam_container_image_self_build_repo: "https://github.com/icewind1991/mx-puppet-steam.git"
 
 # Controls whether the mx-puppet-steam container exposes its HTTP port (tcp/8432 in the container).
diff --git a/roles/matrix-bridge-mx-puppet-twitter/defaults/main.yml b/roles/matrix-bridge-mx-puppet-twitter/defaults/main.yml
index 0e37d51f5..74ccd6cac 100644
--- a/roles/matrix-bridge-mx-puppet-twitter/defaults/main.yml
+++ b/roles/matrix-bridge-mx-puppet-twitter/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_mx_puppet_twitter_enabled: true
 
-matrix_mx_puppet_twitter_container_image_self_build: false
 matrix_mx_puppet_twitter_container_image_self_build_repo: "https://github.com/Sorunome/mx-puppet-twitter.git"
 
 # Controls whether the mx-puppet-twitter container exposes its HTTP port (tcp/8432 in the container).
diff --git a/roles/matrix-client-element/defaults/main.yml b/roles/matrix-client-element/defaults/main.yml
index f836d4a49..174aed89b 100644
--- a/roles/matrix-client-element/defaults/main.yml
+++ b/roles/matrix-client-element/defaults/main.yml
@@ -1,6 +1,5 @@
 matrix_client_element_enabled: true
 
-matrix_client_element_container_image_self_build: false
 matrix_client_element_container_image_self_build_repo: "https://github.com/vector-im/riot-web.git"
 
 matrix_client_element_version: v1.7.30
diff --git a/roles/matrix-corporal/defaults/main.yml b/roles/matrix-corporal/defaults/main.yml
index 05af80460..240ed0412 100644
--- a/roles/matrix-corporal/defaults/main.yml
+++ b/roles/matrix-corporal/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_corporal_enabled: true
 
-matrix_corporal_container_image_self_build: false
 matrix_corporal_container_image_self_build_repo: "https://github.com/devture/matrix-corporal.git"
 
 # Controls whether the matrix-corporal container exposes its gateway HTTP port (tcp/41080 in the container).
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index 2539d8b1c..a35b3c97d 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,6 +1,5 @@
 matrix_coturn_enabled: true
 
-matrix_coturn_container_image_self_build: false
 matrix_coturn_container_image_self_build_repo: "https://github.com/coturn/coturn"
 matrix_coturn_container_image_self_build_repo_version: "docker/{{ matrix_coturn_version }}-r1"
 matrix_coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Dockerfile"
diff --git a/roles/matrix-dynamic-dns/defaults/main.yml b/roles/matrix-dynamic-dns/defaults/main.yml
index 3411d0f83..8047bd471 100644
--- a/roles/matrix-dynamic-dns/defaults/main.yml
+++ b/roles/matrix-dynamic-dns/defaults/main.yml
@@ -24,7 +24,6 @@ matrix_dynamic_dns_systemd_wanted_services_list: []
 matrix_dynamic_dns_systemd_required_services_list: ['docker.service']
 
 # Build the container from source when running in mode
-matrix_dynamic_dns_container_image_self_build: false
 matrix_dynamic_dns_container_image_self_build_repo: "https://github.com/linuxserver/docker-ddclient.git"
 
 # Config paths
diff --git a/roles/matrix-ma1sd/defaults/main.yml b/roles/matrix-ma1sd/defaults/main.yml
index 7ab0d15e2..e4c80fa10 100644
--- a/roles/matrix-ma1sd/defaults/main.yml
+++ b/roles/matrix-ma1sd/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_ma1sd_enabled: true
 
-matrix_ma1sd_container_image_self_build: false
 matrix_ma1sd_container_image_self_build_repo: "https://github.com/ma1uta/ma1sd.git"
 matrix_ma1sd_container_image_self_build_branch: "{{ matrix_ma1sd_version }}"
 
diff --git a/roles/matrix-mailer/defaults/main.yml b/roles/matrix-mailer/defaults/main.yml
index 1340cc702..1e4deff9f 100644
--- a/roles/matrix-mailer/defaults/main.yml
+++ b/roles/matrix-mailer/defaults/main.yml
@@ -2,7 +2,6 @@ matrix_mailer_enabled: true
 
 matrix_mailer_base_path: "{{ matrix_base_data_path }}/mailer"
 
-matrix_mailer_container_image_self_build: false
 matrix_mailer_container_image_self_build_repository_url: "https://github.com/devture/exim-relay"
 matrix_mailer_container_image_self_build_src_files_path: "{{ matrix_mailer_base_path }}/docker-src"
 matrix_mailer_container_image_self_build_version: "{{ matrix_mailer_docker_image.split(':')[1] }}"
diff --git a/roles/matrix-postgres/defaults/main.yml b/roles/matrix-postgres/defaults/main.yml
index 72e420215..8fe9e3394 100644
--- a/roles/matrix-postgres/defaults/main.yml
+++ b/roles/matrix-postgres/defaults/main.yml
@@ -82,7 +82,6 @@ matrix_postgres_import_databases_ignore_regex: "^CREATE DATABASE ({{ matrix_post
 matrix_postgres_additional_databases_postgres_start_wait_timeout_seconds: "{{ 45 if matrix_postgres_architecture in ['arm32', 'arm64'] else 15 }}"
 
 
-matrix_postgres_pgloader_container_image_self_build: false
 matrix_postgres_pgloader_container_image_self_build_repo: "https://github.com/illagrenan/pgloader-docker.git"
 matrix_postgres_pgloader_container_image_self_build_repo_branch: "v{{ matrix_postgres_pgloader_docker_image_tag }}"
 matrix_postgres_pgloader_container_image_self_build_src_path: "{{ matrix_postgres_base_path }}/pgloader-container-src"
diff --git a/roles/matrix-registration/defaults/main.yml b/roles/matrix-registration/defaults/main.yml
index e03891b2e..41bdf77fe 100644
--- a/roles/matrix-registration/defaults/main.yml
+++ b/roles/matrix-registration/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_registration_enabled: true
 
-matrix_registration_container_image_self_build: false
 matrix_registration_container_image_self_build_repo: "https://github.com/ZerataX/matrix-registration"
 matrix_registration_container_image_self_build_branch: "{{ 'master' if matrix_registration_version == 'latest' else matrix_registration_version }}"
 
diff --git a/roles/matrix-registration/tasks/setup_install.yml b/roles/matrix-registration/tasks/setup_install.yml
index 0d7da9cee..910ebb921 100644
--- a/roles/matrix-registration/tasks/setup_install.yml
+++ b/roles/matrix-registration/tasks/setup_install.yml
@@ -33,17 +33,15 @@
 
 - name: Ensure matrix-registration paths exist
   file:
-    path: "{{ item.path }}"
+    path: "{{ item }}"
     state: directory
     mode: 0750
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_registration_base_path }}", when: true }
-    - { path: "{{ matrix_registration_config_path }}", when: true }
-    - { path: "{{ matrix_registration_data_path }}", when: true }
-    - { path: "{{ matrix_registration_docker_src_files_path }}", when: "{{ matrix_registration_container_image_self_build }}"}
-  when: "item.when|bool"
+    - "{{ matrix_registration_base_path }}"
+    - "{{ matrix_registration_config_path }}"
+    - "{{ matrix_registration_data_path }}"
 
 - name: Ensure matrix-registration image is pulled
   docker_image:
diff --git a/roles/matrix-synapse-admin/defaults/main.yml b/roles/matrix-synapse-admin/defaults/main.yml
index 069b62794..e25d7bf48 100644
--- a/roles/matrix-synapse-admin/defaults/main.yml
+++ b/roles/matrix-synapse-admin/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_synapse_admin_enabled: true
 
-matrix_synapse_admin_container_self_build: false
 matrix_synapse_admin_container_self_build_repo: "https://github.com/Awesome-Technologies/synapse-admin.git"
 
 matrix_synapse_admin_docker_src_files_path: "{{ matrix_base_data_path }}/synapse-admin/docker-src"
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index cb5f9a3af..45de77e21 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -3,7 +3,6 @@
 
 matrix_synapse_enabled: true
 
-matrix_synapse_container_image_self_build: false
 matrix_synapse_container_image_self_build_repo: "https://github.com/matrix-org/synapse.git"
 
 matrix_synapse_docker_image: "{{ matrix_synapse_docker_image_name_prefix }}matrixdotorg/synapse:{{ matrix_synapse_docker_image_tag }}"