From d3638814ca90f41e813cb8f928f249e962cc94d4 Mon Sep 17 00:00:00 2001
From: Vincent Wilke <vincent@wilkeimnetz.de>
Date: Sat, 19 Sep 2020 11:44:30 +0200
Subject: [PATCH] chore(synapse): remove v from container version label

---
 roles/synapse/defaults/main.yml    | 3 ++-
 roles/synapse/tasks/deployment.yml | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/synapse/defaults/main.yml b/roles/synapse/defaults/main.yml
index 09dfbc7..4d89286 100644
--- a/roles/synapse/defaults/main.yml
+++ b/roles/synapse/defaults/main.yml
@@ -7,7 +7,7 @@ matrix_synapse_secrets_path: "{{ matrix_synapse_base_path }}/secrets"
 matrix_synapse_dh_path: "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.dh"
 matrix_synapse_baseurl: "https://{{ matrix_server_name }}"
 matrix_synapse_signing_key_path: "{{ matrix_synapse_base_path }}/tls/{{ matrix_server_name }}.signing.key"
-matrix_synapse_version: "v1.19.3"
+matrix_synapse_version: "1.19.3"
 matrix_synapse_log_dir: "/var/log/matrix_synapse"
 matrix_synapse_log_days_keep: 14
 matrix_synapse_pid_file: "{{ matrix_synapse_base_path }}/synapse.pid"
@@ -15,4 +15,5 @@ matrix_synapse_docker_ports: ["8008:8008", "8448:8448"]
 matrix_synapse_docker_labels: {}
 matrix_synapse_extra_docker_volumes: []
 matrix_synapse_container_ref: "docker.io/matrixdotorg/synapse"
+matrix_synapse_container_tag: "v{{ matrix_synapse_version }}"
 matrix_synapse_container_name: "synapse"
diff --git a/roles/synapse/tasks/deployment.yml b/roles/synapse/tasks/deployment.yml
index e2ebec1..c1cb107 100644
--- a/roles/synapse/tasks/deployment.yml
+++ b/roles/synapse/tasks/deployment.yml
@@ -37,7 +37,7 @@
         repo: https://github.com/matrix-org/synapse
         dest: "{{ matrix_synapse_base_path }}/synapse"
         accept_hostkey: yes
-        version: "{{ matrix_synapse_version }}"
+        version: "v{{ matrix_synapse_version }}"
       register: clone_synapse
       tags:
         - pre_install
@@ -56,7 +56,7 @@
 - name: install synapse with docker
   docker_container:
     name: "{{ matrix_synapse_container_name }}"
-    image: "{{ matrix_synapse_container_ref }}:{{ matrix_synapse_version }}"
+    image: "{{ matrix_synapse_container_ref }}:{{ matrix_synapse_container_tag }}"
     ports: "{{ matrix_synapse_docker_ports }}"
     labels: "{{ matrix_synapse_docker_labels_complete }}"
     restart_policy: unless-stopped