From c07fd87326083a0f4c0cda33bdb87abd69e3ea56 Mon Sep 17 00:00:00 2001
From: alexbelgium <alexandre.pary@gmail.com>
Date: Sun, 1 Jun 2025 19:42:10 +0200
Subject: [PATCH] update

---
 openproject/config.json                      |  4 ++--
 openproject/rootfs/etc/cont-init.d/99-run.sh | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/openproject/config.json b/openproject/config.json
index ecfe5f6b8..2fc72cb3c 100644
--- a/openproject/config.json
+++ b/openproject/config.json
@@ -10,7 +10,7 @@
     "OPENPROJECT_EDITION": "bim",
     "PGDATA": "/config/pg",
     "APP_DATA_PATH": "/config/assets",
-    "OPENPROJECT_ATTACHMENTS__STORAGE__PATH": "/config/files"
+    "OPENPROJECT_ATTACHMENTS__STORAGE__PATH": "/config/assets/files"
   },
   "image": "ghcr.io/alexbelgium/openproject-{arch}",
   "init": false,
@@ -39,6 +39,6 @@
   "slug": "openproject",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/openproject",
-  "version": "16.0-5",
+  "version": "16.0-6",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
diff --git a/openproject/rootfs/etc/cont-init.d/99-run.sh b/openproject/rootfs/etc/cont-init.d/99-run.sh
index bbc8d1fca..60b895004 100755
--- a/openproject/rootfs/etc/cont-init.d/99-run.sh
+++ b/openproject/rootfs/etc/cont-init.d/99-run.sh
@@ -2,15 +2,18 @@
 
 bashio::log.info "Starting OpenProject"
 
-for folders in pg assets; do
-    mkdir -p /config/"$folders"/
-    if [ -d /data/"$folders" ]; then
-        bashio::log.warning "Migrating /data/$folders to /config/$folders"
-        cp -rf /data/"$folders"/ /config/"$folders"/
-        rm -r /data/"$folders"
+# Ensure persistence for PGDATA and asset folders
+for folder in pg assets; do
+    mkdir -p /config/"$folder"
+    if [ -d /data/"$folder" ] && [ "$(ls -A /data/"$folder")" ]; then
+        # Copy only if source is non-empty
+        cp -a /data/"$folder"/. /config/"$folder"/
+        rm -rf /data/"$folder"
     fi
 done
 
+mkdir -p /config/assets/files
+
 cd /app || true
 
 exec ./docker/prod/entrypoint.sh ./docker/prod/supervisord