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

fix: startup script order fix
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-05 17:17:56 +01:00
parent 3a060cdf09
commit 67bb3e944b
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,6 +1,6 @@
## .idea folder (JetBrains IDEs) ## .idea folder (JetBrains IDEs)
.idea/ .idea
## File-based project format ## File-based project format
*.iws *.iws

17
.idea/workspace.xml
View File

@ -4,9 +4,9 @@
<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="fix: docker config symlink"> <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="fix: config symlink">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<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$/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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -188,7 +188,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1730806503846</updated> <updated>1730806503846</updated>
</task> </task>
<option name="localTasksCounter" value="11" /> <task id="LOCAL-00011" summary="fix: config symlink">
<option name="closed" value="true" />
<created>1730823252701</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1730823252701</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -217,6 +225,7 @@
<MESSAGE value="chore: CloudronManifest Dockerfile" /> <MESSAGE value="chore: CloudronManifest Dockerfile" />
<MESSAGE value="fix: start.sh permissions" /> <MESSAGE value="fix: start.sh permissions" />
<MESSAGE value="fix: docker config symlink" /> <MESSAGE value="fix: docker config symlink" />
<option name="LAST_COMMIT_MESSAGE" value="fix: docker config symlink" /> <MESSAGE value="fix: config symlink" />
<option name="LAST_COMMIT_MESSAGE" value="fix: config symlink" />
</component> </component>
</project> </project>

6
start.sh
View File

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
echo "==> Changing ownership"
chown -R cloudron:cloudron /app/data
echo "==> Symlink the config.yml to the editable /app/data directory" echo "==> Symlink the config.yml to the editable /app/data directory"
ln -s /app/config.yml /app/data/config.yml ln -s /app/config.yml /app/data/config.yml
echo "==> Changing ownership"
chown -R cloudron:cloudron /app/data
echo "==> Starting Blossom" echo "==> Starting Blossom"
exec /usr/local/bin/gosu cloudron:cloudron node /app exec /usr/local/bin/gosu cloudron:cloudron node /app