stuff/blossom-cloudron
4
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: blossom config
All checks were successful
Release to Gitea Container Registry / build_and_push (push) Successful in 12s
Details

Browse Source
This commit is contained in:
Stixx 2024-11-06 15:19:26 +01:00
parent 31771f5a2e
commit bf92a6c386
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/workspace.xml
View File

@ -4,7 +4,7 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <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$/.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$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/start.sh" beforeDir="false" afterPath="$PROJECT_DIR$/start.sh" 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="1730757410332" duration="15231000" />
<workItem from="1730820334454" duration="124000" /> <workItem from="1730820334454" duration="124000" />
<workItem from="1730884753681" duration="7433000" /> <workItem from="1730884753681" duration="7433000" />
<workItem from="1730901852078" duration="544000" /> <workItem from="1730901852078" duration="903000" />
</task> </task>
<task id="LOCAL-00001" summary="init"> <task id="LOCAL-00001" summary="init">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -206,7 +206,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1730825314560</updated> <updated>1730825314560</updated>
</task> </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 /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -237,6 +245,7 @@
<MESSAGE value="fix: docker config symlink" /> <MESSAGE value="fix: docker config symlink" />
<MESSAGE value="fix: config symlink" /> <MESSAGE value="fix: config symlink" />
<MESSAGE value="fix: temporary fix reverse 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> </component>
</project> </project>

1
Dockerfile
View File

@ -27,7 +27,6 @@ RUN cd admin && pnpm build
FROM base AS main FROM base AS main
COPY start.sh start.sh COPY start.sh start.sh
COPY config.example.yml /app/data/config.yml
COPY CloudronManifest.json . COPY CloudronManifest.json .
RUN chmod +x start.sh RUN chmod +x start.sh

3
start.sh
View File

@ -3,5 +3,8 @@
echo "==> Changing ownership" echo "==> Changing ownership"
chown -R cloudron:cloudron /app/data chown -R cloudron:cloudron /app/data
echo "==> Copy config"
cp config.example.yml /app/data/config.yml
echo "==> Starting Blossom" echo "==> Starting Blossom"
exec /usr/local/bin/gosu cloudron:cloudron node /app exec /usr/local/bin/gosu cloudron:cloudron node /app