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

---
 openproject/CHANGELOG.md                     |  4 +++-
 openproject/Dockerfile                       | 18 +++---------------
 openproject/config.json                      |  9 ++++++++-
 openproject/rootfs/etc/cont-init.d/99-run.sh | 16 ++++++++++++++++
 4 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100755 openproject/rootfs/etc/cont-init.d/99-run.sh

diff --git a/openproject/CHANGELOG.md b/openproject/CHANGELOG.md
index b5dae04f6..9785c722c 100644
--- a/openproject/CHANGELOG.md
+++ b/openproject/CHANGELOG.md
@@ -1,5 +1,7 @@
-## 16.0-4 (01-06-2025)
 - BREAKING CHANGE : now options must be configured from the addon options : OPENPROJECT_SECRET_KEY_BASE ; OPENPROJECT_HOST__NAME ; OPENPROJECT_HTTPS ; OPENPROJECT_DEFAULT__LANGUAGE
+- BREAKING CHANGE : enable config.yaml for additional environment variables
+- BREAKING CHANGE : moved files to /config instead of /data to be able to see them
+- Add persistence for data attachements
 
 ## 16.0-3 (01-06-2025)
 - Minor bugs fixed
diff --git a/openproject/Dockerfile b/openproject/Dockerfile
index 8a50f590a..66f2062b0 100644
--- a/openproject/Dockerfile
+++ b/openproject/Dockerfile
@@ -27,27 +27,14 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_SERVICES_GRACETIME=0
 
-ENV OPENPROJECT_SECRET_KEY_BASE=addon_secret \
-    OPENPROJECT_HOST__NAME=localhost:8080 \
-    OPENPROJECT_HTTPS=false \
-    OPENPROJECT_DEFAULT__LANGUAGE=en \
-    OPENPROJECT_EDITION=bim \
-    PGDATA=/data/pg\
-    APP_DATA_PATH=/data/assets
-
 USER root
 
-# hadolint ignore=SC2154
-RUN sed -i "s|/bin/bash|/bin/bashio|g" /app/docker/prod/entrypoint.sh && \
-    sed -i "1a /./ha_entrypoint.sh" /app/docker/prod/entrypoint.sh && \
-    sed -i "2a\for variable in OPENPROJECT_SECRET_KEY_BASE OPENPROJECT_HOST__NAME OPENPROJECT_HTTPS OPENPROJECT_DEFAULT__LANGUAGE; do if bashio::config.has_value \$variable; then export \$variable=\"\$(bashio::config $variable)\"; fi; done" /app/docker/prod/entrypoint.sh
-
 ##################
 # 3 Install apps #
 ##################
 
 # Copy local files
-# COPY rootfs/ /
+COPY rootfs/ /
 
 # Uses /bin for compatibility purposes
 # hadolint ignore=DL4005
@@ -82,7 +69,8 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
 RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
 
-# ENTRYPOINT [ "/ha_entrypoint.sh" ]
+ENTRYPOINT [ "/usr/bin/env" ]
+CMD [ "/ha_entrypoint.sh" ]
 
 ############
 # 5 Labels #
diff --git a/openproject/config.json b/openproject/config.json
index d2ca2a3af..ecfe5f6b8 100644
--- a/openproject/config.json
+++ b/openproject/config.json
@@ -5,6 +5,13 @@
   ],
   "codenotary": "alexandrep.github@gmail.com",
   "description": "Openproject for Home Assistant",
+  "environment": {
+    "OPENPROJECT_SECRET_KEY_BASE": "addon_secret",
+    "OPENPROJECT_EDITION": "bim",
+    "PGDATA": "/config/pg",
+    "APP_DATA_PATH": "/config/assets",
+    "OPENPROJECT_ATTACHMENTS__STORAGE__PATH": "/config/files"
+  },
   "image": "ghcr.io/alexbelgium/openproject-{arch}",
   "init": false,
   "map": [
@@ -32,6 +39,6 @@
   "slug": "openproject",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/openproject",
-  "version": "16.0-4",
+  "version": "16.0-5",
   "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
new file mode 100755
index 000000000..bbc8d1fca
--- /dev/null
+++ b/openproject/rootfs/etc/cont-init.d/99-run.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bashio
+
+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"
+    fi
+done
+
+cd /app || true
+
+exec ./docker/prod/entrypoint.sh ./docker/prod/supervisord