From bf92a6c386a5dd258bd6d1ffc3b709b79a8933eb Mon Sep 17 00:00:00 2001
From: Stixx <stixx@nostrdev.com>
Date: Wed, 6 Nov 2024 15:19:26 +0100
Subject: [PATCH] fix: blossom config

---
 .idea/workspace.xml | 17 +++++++++++++----
 Dockerfile          |  1 -
 start.sh            |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index edc1aa6..3e1008c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="">
+    <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="fix: implementing bloossom server config ENV variable">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/start.sh" beforeDir="false" afterPath="$PROJECT_DIR$/start.sh" afterDir="false" />
@@ -108,7 +108,7 @@
       <workItem from="1730757410332" duration="15231000" />
       <workItem from="1730820334454" duration="124000" />
       <workItem from="1730884753681" duration="7433000" />
-      <workItem from="1730901852078" duration="544000" />
+      <workItem from="1730901852078" duration="903000" />
     </task>
     <task id="LOCAL-00001" summary="init">
       <option name="closed" value="true" />
@@ -206,7 +206,15 @@
       <option name="project" value="LOCAL" />
       <updated>1730825314560</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="fix: implementing bloossom server config ENV variable">
+      <option name="closed" value="true" />
+      <created>1730902415201</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1730902415201</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -237,6 +245,7 @@
     <MESSAGE value="fix: docker config symlink" />
     <MESSAGE value="fix: config symlink" />
     <MESSAGE value="fix: temporary fix reverse symlink" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: temporary fix reverse symlink" />
+    <MESSAGE value="fix: implementing bloossom server config ENV variable" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: implementing bloossom server config ENV variable" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 52380cd..262f971 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,6 @@ RUN cd admin && pnpm build
 FROM base AS main
 
 COPY start.sh start.sh
-COPY config.example.yml /app/data/config.yml
 COPY CloudronManifest.json .
 
 RUN chmod +x start.sh
diff --git a/start.sh b/start.sh
index 30fcd0a..b0b7bcd 100644
--- a/start.sh
+++ b/start.sh
@@ -3,5 +3,8 @@
 echo "==> Changing ownership"
 chown -R cloudron:cloudron /app/data
 
+echo "==> Copy config"
+cp config.example.yml /app/data/config.yml
+
 echo "==> Starting Blossom"
 exec /usr/local/bin/gosu cloudron:cloudron node /app