chore(synapse): migrate to standardized container image variable structure

roles/synapse/defaults/main.yml

@@ -28,10 +28,28 @@ matrix_synapse_docker_command:
   - "synapse.app.homeserver"
   - "-c"
   - "{{ matrix_synapse_base_path }}/homeserver.yaml"
-matrix_synapse_container_ref: "docker.io/matrixdotorg/synapse"
-matrix_synapse_container_tag: "v{{ matrix_synapse_version }}"
 matrix_synapse_container_name: "synapse"
 
+matrix_synapse_container_image_reference: >-
+  {{
+    matrix_synapse_container_image_repository
+    + ':'
+    + matrix_synapse_container_image_tag | default('v' + matrix_synapse_version)
+  }}
+matrix_synapse_container_image_repository: >-
+  {{
+    (
+      container_registries[matrix_synapse_container_image_registry]
+      | default(matrix_synapse_container_image_registry)
+    )
+    + '/'
+    + matrix_synapse_container_image_namespace | default('')
+    + matrix_synapse_container_image_name
+  }}
+matrix_synapse_container_image_registry: "docker.io"
+matrix_synapse_container_image_namespace: "matrixdotorg/"
+matrix_synapse_container_image_name: "synapse"
+
 # Redis config
 matrix_synapse_redis_enabled: false
 matrix_synapse_redis_host: ~
@@ -51,7 +69,6 @@ matrix_synapse_worker_replication_bind_ip: "127.0.0.1"
 matrix_synapse_worker_listener_base_port: 16000
 matrix_synapse_worker_listener_bind_base_ip: "0.0.0.0"
 matrix_synapse_worker_labels: {}
-matrix_synapse_worker_image: "{{  matrix_synapse_container_ref }}:{{ matrix_synapse_container_tag }}"
 
 # Control which workers (or how many) to run
 matrix_synapse_workers_client: 0

roles/synapse/tasks/deploy_workers.yml

@@ -28,7 +28,7 @@
     - name: Deploy workers (docker)
       docker_container:
         name: "{{ item.container_name }}"
-        image: "{{ matrix_synapse_worker_image }}"
+        image: "{{ matrix_synapse_container_image_reference }}"
         labels: >-
           {{
             item.labels

roles/synapse/tasks/deployment.yml

@@ -55,7 +55,7 @@
 
 - name: Ensure synapse container image is present
   docker_image:
-    name: "{{ matrix_synapse_container_ref }}:{{ matrix_synapse_container_tag }}"
+    name: "{{ matrix_synapse_container_image_reference }}"
     force_source: "{{ matrix_synapse_docker_pull }}"
     source: pull
     state: present
@@ -69,7 +69,7 @@
 - name: Ensure synapse container is running
   docker_container:
     name: "{{ matrix_synapse_container_name }}"
-    image: "{{ matrix_synapse_container_ref }}:{{ matrix_synapse_container_tag }}"
+    image: "{{ matrix_synapse_container_image_reference }}"
     networks: "{{ matrix_synapse_docker_networks }}"
     etc_hosts: "{{ matrix_synapse_docker_etc_hosts }}"
     ports: "{{ matrix_synapse_docker_ports }}"

roles/synapse/vars/main.yml

@@ -170,7 +170,7 @@ matrix_synapse_base_config:
         action: allow
 matrix_synapse_docker_labels_complete: "{{ matrix_synapse_docker_labels_base | combine(matrix_synapse_docker_labels) }}"
 matrix_synapse_docker_labels_base:
-  version: "{{ matrix_synapse_version if (matrix_synapse_container_tag == 'v' + matrix_synapse_version) else matrix_synapse_container_tag }}"
+  version: "{{ matrix_synapse_container_image_tag | default(matrix_synapse_version) }}"
 matrix_synapse_worker_labels_base: "{{ matrix_synapse_docker_labels_base }}"
 
 # Control where which paths get routed