Skip to content

Support SIYUAN_WORKSPACE_PATH in Docker#14286

Merged
88250 merged 1 commit intosiyuan-note:devfrom
luke-zhu:workspace_space
Mar 5, 2025
Merged

Support SIYUAN_WORKSPACE_PATH in Docker#14286
88250 merged 1 commit intosiyuan-note:devfrom
luke-zhu:workspace_space

Conversation

@luke-zhu
Copy link
Copy Markdown
Contributor

@luke-zhu luke-zhu commented Mar 5, 2025

Feature or bug? 特性或者缺陷?

This change makes SIYUAN_WORKSPACE_PATH env variable
update the WORKSPACE_DIR variable in the Docker entrypoint
shell script.

Multilingual or copywriting? 多语言或者文案?

N/A

Dev branch!

Any changes should be submitted to the dev branch.
任何改动,请提交到 dev 分支。

This change makes SIYUAN_WORKSPACE_PATH env variable
update the WORKSPACE_DIR variable in the Docker entrypoint
shell script.
@github-actions github-actions bot changed the base branch from master to dev March 5, 2025 08:18
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 5, 2025

Your PR was set to target master, PRs should be target dev
The base branch of this PR has been automatically changed to dev, please check that there are no merge conflicts

@luke-zhu
Copy link
Copy Markdown
Contributor Author

luke-zhu commented Mar 5, 2025

I have tested using the following config:

image

In the old PR the env variable handling was bugged. And it seems like -v is not supported so I use -n.

WORKSPACE_DIR can be set at the top of the file instead too:

WORKSPACE_DIR=${SIYUAN_WORKSPACE_PATH:-"/siyuan/workspace"}

This saves 3 lines of code but affects code distance between --workspace and SIYUAN_WORKSPACE_PATH.

@luke-zhu
Copy link
Copy Markdown
Contributor Author

luke-zhu commented Mar 5, 2025

And reverting back still works:
image
image

@88250 88250 merged commit 2a00697 into siyuan-note:dev Mar 5, 2025
1 check passed
@88250
Copy link
Copy Markdown
Member

88250 commented Mar 5, 2025

感谢你的贡献,思源有你更精彩!
Thank you for your contribution. SiYuan will be more wonderful with you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants