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

chore: merge
All checks were successful
Release to Gitea Container Registry / build_and_push (push) Successful in 6s
Details

Browse Source
This commit is contained in:
b 2024-11-05 15:34:09 +00:00
commit 3d1926a2a7
3 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

56
.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="chore: CloudronManifest Dockerfile"> <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="">
<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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -38,23 +38,23 @@
<option name="openDirectoriesWithSingleClick" value="true" /> <option name="openDirectoriesWithSingleClick" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"Docker.Dockerfile prod-deps.executor": "Run", &quot;Docker.Dockerfile prod-deps.executor&quot;: &quot;Run&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"git-widget-placeholder": "master", &quot;git-widget-placeholder&quot;: &quot;master&quot;,
"last_opened_file_path": "/home/mihajlo/external-projects/nostrdev/stuff/blossom-cloudron", &quot;last_opened_file_path&quot;: &quot;/home/mihajlo/external-projects/nostrdev/stuff/blossom-cloudron&quot;,
"node.js.detected.package.eslint": "true", &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
"node.js.detected.package.tslint": "true", &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
"node.js.selected.package.eslint": "(autodetect)", &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
"node.js.selected.package.tslint": "(autodetect)", &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
"nodejs_package_manager_path": "pnpm", &quot;nodejs_package_manager_path&quot;: &quot;pnpm&quot;,
"prettierjs.PrettierConfiguration.Package": "/home/mihajlo/external-projects/nostrdev/stuff/blossom-cloudron/node_modules/prettier", &quot;prettierjs.PrettierConfiguration.Package&quot;: &quot;/home/mihajlo/external-projects/nostrdev/stuff/blossom-cloudron/node_modules/prettier&quot;,
"settings.editor.selected.configurable": "project.propVCSSupport.CommitDialog", &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.CommitDialog&quot;,
"ts.external.directory.path": "/home/mihajlo/Downloads/WebStorm-2024.2.3/WebStorm-242.23339.15/plugins/javascript-plugin/jsLanguageServicesImpl/external", &quot;ts.external.directory.path&quot;: &quot;/home/mihajlo/Downloads/WebStorm-2024.2.3/WebStorm-242.23339.15/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
"vue.rearranger.settings.migration": "true" &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
@ -76,7 +76,9 @@
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration default="true" type="docker-deploy" factoryName="dockerfile" temporary="true"> <configuration default="true" type="docker-deploy" factoryName="dockerfile" temporary="true">
<deployment type="dockerfile" /> <deployment type="dockerfile">
<settings />
</deployment>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<recent_temporary> <recent_temporary>
@ -102,7 +104,8 @@
<updated>1730730943588</updated> <updated>1730730943588</updated>
<workItem from="1730730944615" duration="1999000" /> <workItem from="1730730944615" duration="1999000" />
<workItem from="1730732957705" duration="8239000" /> <workItem from="1730732957705" duration="8239000" />
<workItem from="1730757410332" duration="12639000" /> <workItem from="1730757410332" duration="15231000" />
<workItem from="1730820334454" duration="124000" />
</task> </task>
<task id="LOCAL-00001" summary="init"> <task id="LOCAL-00001" summary="init">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -176,7 +179,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1730805591992</updated> <updated>1730805591992</updated>
</task> </task>
<option name="localTasksCounter" value="10" /> <task id="LOCAL-00010" summary="fix: start.sh permissions">
<option name="closed" value="true" />
<created>1730806503846</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1730806503846</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -203,6 +214,7 @@
<MESSAGE value="fix: removing blossom source code from the repo" /> <MESSAGE value="fix: removing blossom source code from the repo" />
<MESSAGE value="chore: fixing CloudronManifest" /> <MESSAGE value="chore: fixing CloudronManifest" />
<MESSAGE value="chore: CloudronManifest Dockerfile" /> <MESSAGE value="chore: CloudronManifest Dockerfile" />
<option name="LAST_COMMIT_MESSAGE" value="chore: CloudronManifest Dockerfile" /> <MESSAGE value="fix: start.sh permissions" />
<option name="LAST_COMMIT_MESSAGE" value="fix: start.sh permissions" />
</component> </component>
</project> </project>

2
Dockerfile
View File

@ -42,7 +42,7 @@ HEALTHCHECK CMD curl --fail http://localhost:3000 || exit 1
# Cloudron specific labels # Cloudron specific labels
LABEL cloudronManifestPath="CloudronManifest.json" LABEL cloudronManifestPath="CloudronManifest.json"
VOLUME [ "/app/data" ] VOLUME [ "/app/data", "/app" ]
EXPOSE 3000 EXPOSE 3000
ENV DEBUG="blossom-server,blossom-server:*" ENV DEBUG="blossom-server,blossom-server:*"