From 4590331a2b4a584bb8274bdcf17dd3a7489a06de Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 21 Apr 2025 22:16:50 +0200
Subject: [PATCH] Solved openproject mount bug

---
 roles/docker-bigbluebutton/handlers/main.yml     |  2 +-
 roles/docker-compose/handlers/main.yml           |  4 ++--
 roles/docker-matrix-compose/tasks/main.yml       |  2 +-
 .../templates/docker-compose.yml.j2              | 16 +++++++++++++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/roles/docker-bigbluebutton/handlers/main.yml b/roles/docker-bigbluebutton/handlers/main.yml
index 15030e7b..da6a338a 100644
--- a/roles/docker-bigbluebutton/handlers/main.yml
+++ b/roles/docker-bigbluebutton/handlers/main.yml
@@ -92,7 +92,7 @@
 
 - name: docker compose up bigbluebutton
   command:
-    cmd: "docker-compose -p bigbluebutton up -d --force-recreate{% if mode_cleanup | bool %} --remove-orphans{% endif %}"
+    cmd: "docker-compose -p bigbluebutton up -d --force-recreate --remove-orphans"
     # Don't use the --build flag here. This leads to bugs
     chdir: "{{ docker_compose.directories.instance }}"
   environment:
diff --git a/roles/docker-compose/handlers/main.yml b/roles/docker-compose/handlers/main.yml
index 1dde1e4b..6ee5cebe 100644
--- a/roles/docker-compose/handlers/main.yml
+++ b/roles/docker-compose/handlers/main.yml
@@ -11,7 +11,7 @@
 # default setup for docker compose files
 - name: docker compose project setup
   command:
-    cmd: "docker-compose -p {{application_id}} up -d --force-recreate{% if mode_cleanup | bool %} --remove-orphans{% endif %}"
+    cmd: "docker-compose -p {{application_id}} up -d --force-recreate --remove-orphans"
     chdir: "{{docker_compose.directories.instance}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
@@ -22,7 +22,7 @@
 # for performance reasons it's not recommended to use this if there is no build tag specified
 - name: docker compose project build and setup 
   command:
-    cmd: "docker-compose -p {{application_id}} up -d --force-recreate --build{% if mode_cleanup | bool %} --remove-orphans{% endif %}"
+    cmd: "docker-compose -p {{application_id}} up -d --force-recreate --build --remove-orphans"
     chdir: "{{docker_compose.directories.instance}}"
   environment:
     COMPOSE_HTTP_TIMEOUT: 600
diff --git a/roles/docker-matrix-compose/tasks/main.yml b/roles/docker-matrix-compose/tasks/main.yml
index 1b285f45..bbcfa32e 100644
--- a/roles/docker-matrix-compose/tasks/main.yml
+++ b/roles/docker-matrix-compose/tasks/main.yml
@@ -109,7 +109,7 @@
 
 - name: docker compose project setup
   command:
-    cmd: "docker-compose -p {{application_id}} up -d{% if mode_cleanup | bool %} --remove-orphans{% endif %}"
+    cmd: "docker-compose -p {{application_id}} up -d --remove-orphans"
     chdir: "{{docker_compose.directories.instance}}"
   environment:
     COMPOSE_HTTP_TIMEOUT:   600
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 42b312e7..ea6da29f 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -3,9 +3,6 @@ x-op-app: &app
   logging:
     driver: journald
   image: {{custom_openproject_image}}
-  volumes:
-    - "data:/var/openproject/assets"
-    - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
   build:
     context: {{openproject_plugins_service}}
     dockerfile: Dockerfile
@@ -52,6 +49,9 @@ services:
       timeout: 3s
       retries: 3
       start_period: 30s
+    volumes:
+      - "data:/var/openproject/assets"
+      - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
       
   worker:
     <<: *app
@@ -64,6 +64,10 @@ services:
         condition: service_started
       seeder:
         condition: service_started
+    volumes:
+      - "data:/var/openproject/assets"
+      - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
+
 
   cron:
     <<: *app
@@ -76,6 +80,9 @@ services:
         condition: service_started
       seeder:
         condition: service_started
+    volumes:
+      - "data:/var/openproject/assets"
+      - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
 
   seeder:
     <<: *app
@@ -87,6 +94,9 @@ services:
       driver: journald
     restart: on-failure
 {% include 'templates/docker/container/networks.yml.j2' %}
+    volumes:
+      - "data:/var/openproject/assets"
+      - "{{dummy_volume}}:/var/openproject/pgdata" # This mount is unnecessary and just done to prevent anonymous volumes
 
 {% include 'templates/docker/compose/networks.yml.j2' %}