From bc5059fe6255a4ba98ccf6a5fdbb1bb660642264 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 21 Jul 2025 10:56:55 +0200
Subject: [PATCH] Solved taiga path bugs

---
 roles/web-app-taiga/config/main.yml                 | 5 +++--
 roles/web-app-taiga/templates/docker-compose.yml.j2 | 6 +++---
 roles/web-app-taiga/vars/main.yml                   | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/roles/web-app-taiga/config/main.yml b/roles/web-app-taiga/config/main.yml
index efb4a6be..3c8c351d 100644
--- a/roles/web-app-taiga/config/main.yml
+++ b/roles/web-app-taiga/config/main.yml
@@ -1,4 +1,3 @@
-version:              "latest"
 oidc: {}
     # Taiga doesn't have a functioning oidc support at the moment
     # See
@@ -9,13 +8,15 @@ flavor:               'taigaio' # Potential flavors: robrotheram, taigaio
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:   true
+  port-ui-desktop:    true
   oidc:               false
   central_database:   true
 docker:
   services:
     database:
       enabled: true
+    taiga: 
+      version: "latest"
 csp:
   flags:
     script-src-elem:
diff --git a/roles/web-app-taiga/templates/docker-compose.yml.j2 b/roles/web-app-taiga/templates/docker-compose.yml.j2
index de8b0b93..97d933d7 100644
--- a/roles/web-app-taiga/templates/docker-compose.yml.j2
+++ b/roles/web-app-taiga/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@
 
   taiga-back:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: {{taiga_image_backend}}:{{applications.taiga.version}}
+    image: "{{taiga_image_backend}}:{{ taiga_version }}"
     volumes:
       # These volumens will be used by taiga-back and taiga-async.
       - static-data:/taiga-back/static
@@ -34,7 +34,7 @@
 
   taiga-async:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: {{taiga_image_backend}}:{{applications.taiga.version}}
+    image: "{{taiga_image_backend}}:{{ taiga_version }}"
     entrypoint: ["/taiga-back/docker/async_entrypoint.sh"]
     volumes:
       # These volumens will be used by taiga-back and taiga-async.
@@ -76,7 +76,7 @@
       taiga:
 
   taiga-front:
-    image: {{taiga_image_frontend}}:{{applications.taiga.version}}
+    image: "{{taiga_image_frontend}}:{{ taiga_version }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
       taiga:
diff --git a/roles/web-app-taiga/vars/main.yml b/roles/web-app-taiga/vars/main.yml
index 732d1494..5c0d054f 100644
--- a/roles/web-app-taiga/vars/main.yml
+++ b/roles/web-app-taiga/vars/main.yml
@@ -14,3 +14,5 @@ docker_pull_git_repository:          true
 settings_files:
 - urls
 - local
+
+taiga_version:   "{{ applications | get_app_conf(application_id, 'docker.services.taiga.version', True) }}"
\ No newline at end of file